diff options
75 files changed, 504 insertions, 10851 deletions
diff --git a/COPYING.LIB b/COPYING-LGPLv2.1 index 2b4628e4aa..4362b49151 100644 --- a/COPYING.LIB +++ b/COPYING-LGPLv2.1 @@ -1,112 +1,125 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 - Copyright (C) 1991 Free Software Foundation, Inc. - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs @@ -133,7 +146,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an @@ -145,7 +158,7 @@ Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - + 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 @@ -203,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -254,8 +267,8 @@ Library will still fall under Section 6.) distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or + + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit @@ -282,23 +295,31 @@ of these things: Library will not necessarily be able to recompile the application to use the modified definitions.) - b) Accompany the work with a written offer, valid for at + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. - c) If distribution of the work is made by offering access to copy + d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. - d) Verify that the user has already received a copy of these + e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. @@ -308,7 +329,7 @@ restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -347,9 +368,9 @@ Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to +You are not responsible for enforcing compliance by third parties with this License. - + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -390,7 +411,7 @@ excluded. In such case, this License incorporates the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. +versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. @@ -401,7 +422,7 @@ conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -411,7 +432,7 @@ decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. @@ -434,9 +455,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Libraries + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that @@ -453,19 +474,18 @@ convey the exclusion of warranty; and each file should have at least the Copyright (C) <year> <name of author> This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. diff --git a/Makefile.am b/Makefile.am index d19df6f3b6..19ec8d0c8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,4 +26,3 @@ clean-local: endif ACLOCAL_AMFLAGS = -I m4 -ACLOCAL_LDFLAGS = -ljson diff --git a/bgpd/Makefile.am b/bgpd/Makefile.am index 1730f5cdb8..69c0504af4 100644 --- a/bgpd/Makefile.am +++ b/bgpd/Makefile.am @@ -45,6 +45,8 @@ BGP_VNC_RFAPI_HD=rfapi/bgp_rfapi_cfg.h \ rfapi/vnc_export_table.h \ rfapi/vnc_import_bgp.h \ rfapi/vnc_zebra.h \ + rfapi/vnc_export_bgp_p.h \ + rfapi/vnc_import_bgp_p.h \ bgp_vnc_types.h $(BGP_VNC_RFP_HD) else diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c index de6caa1596..bdafe5a0cb 100644 --- a/bgpd/bgp_aspath.c +++ b/bgpd/bgp_aspath.c @@ -25,7 +25,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "memory.h" #include "vector.h" #include "vty.h" -#include "str.h" #include "log.h" #include "stream.h" #include "command.h" diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c index f6b0500433..0c74ba5459 100644 --- a/bgpd/bgp_debug.c +++ b/bgpd/bgp_debug.c @@ -25,7 +25,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "linklist.h" #include "stream.h" #include "command.h" -#include "str.h" #include "log.h" #include "sockunion.h" #include "memory.h" diff --git a/bgpd/bgp_regex.h b/bgpd/bgp_regex.h index 9fc832229a..e5d28d1b74 100644 --- a/bgpd/bgp_regex.h +++ b/bgpd/bgp_regex.h @@ -26,11 +26,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #ifdef HAVE_LIBPCREPOSIX # include <pcreposix.h> #else -# ifdef HAVE_GNU_REGEX -# include <regex.h> -# else -# include "regex-gnu.h" -# endif /* HAVE_GNU_REGEX */ +# include <regex.h> #endif /* HAVE_LIBPCREPOSIX */ extern void bgp_regex_free (regex_t *regex); diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 6c71fd525c..e52aad2b9e 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -26,7 +26,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "command.h" #include "stream.h" #include "filter.h" -#include "str.h" #include "log.h" #include "routemap.h" #include "buffer.h" diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index 0701415146..992e53b8ce 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -32,11 +32,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #ifdef HAVE_LIBPCREPOSIX # include <pcreposix.h> #else -# ifdef HAVE_GNU_REGEX -# include <regex.h> -# else -# include "regex-gnu.h" -# endif /* HAVE_GNU_REGEX */ +# include <regex.h> #endif /* HAVE_LIBPCREPOSIX */ #include "buffer.h" #include "sockunion.h" diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c index 77b979e56e..9e5ec4b26d 100644 --- a/bgpd/bgp_updgrp.c +++ b/bgpd/bgp_updgrp.c @@ -37,7 +37,6 @@ #include "memory.h" #include "filter.h" #include "routemap.h" -#include "str.h" #include "log.h" #include "plist.h" #include "linklist.h" diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c index 3cb3ddcdea..e18ba235c7 100644 --- a/bgpd/bgp_updgrp_packet.c +++ b/bgpd/bgp_updgrp_packet.c @@ -37,7 +37,6 @@ #include "memory.h" #include "filter.h" #include "routemap.h" -#include "str.h" #include "log.h" #include "plist.h" #include "linklist.h" diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 77cf410a0f..41f09e36a3 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -9062,6 +9062,8 @@ bgp_show_one_peer_group (struct vty *vty, struct peer_group *group) af_str = "IPv4"; else if (afi == AFI_IP6) af_str = "IPv6"; + else + af_str = "???"; lr_count = listcount(group->listen_range[afi]); if (lr_count) { diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 1b79fb7821..e8bdd08a44 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -13,7 +13,7 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GN5U General Public License +You should have received a copy of the GNU General Public License along with GNU Zebra; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -31,7 +31,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "memory.h" #include "filter.h" #include "routemap.h" -#include "str.h" #include "log.h" #include "plist.h" #include "linklist.h" diff --git a/bgpd/rfapi/vnc_debug.c b/bgpd/rfapi/vnc_debug.c index 5db6f558b8..05b2951b4f 100644 --- a/bgpd/rfapi/vnc_debug.c +++ b/bgpd/rfapi/vnc_debug.c @@ -25,7 +25,6 @@ #include "lib/linklist.h" #include "lib/stream.h" #include "lib/command.h" -#include "lib/str.h" #include "lib/log.h" #include "bgpd/rfapi/vnc_debug.h" diff --git a/configure.ac b/configure.ac index afb0731db5..8defe7b200 100755 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_PREREQ(2.60) AC_INIT(Quagga, 0.99.24+cl3u5, [https://bugzilla.quagga.net]) -CONFIG_ARGS="$*" +CONFIG_ARGS="$ac_configure_args" AC_SUBST(CONFIG_ARGS) AC_CONFIG_SRCDIR(lib/zebra.h) AC_CONFIG_MACRO_DIR([m4]) @@ -49,19 +49,8 @@ dnl XXX add --pkgsrcrcdir to autoconf standard directory list somehow AC_SUBST(pkgsrcdir) AC_SUBST(pkgsrcrcdir) -dnl ------------ -dnl Check CFLAGS -dnl ------------ -AC_ARG_WITH(cflags, -[ --with-cflags Set CFLAGS for use in compilation.]) -if test "x$with_cflags" != "x" ; then - CFLAGS="$with_cflags" ; cflags_specified=yes ; -elif test -n "$CFLAGS" ; then - cflags_specified=yes ; -fi - AC_ARG_ENABLE(tcmalloc, -[ --enable-tcmalloc Turn on tcmalloc], + AS_HELP_STRING([--enable-tcmalloc], [Turn on tcmalloc]), [case "${enableval}" in yes) tcmalloc_enabled=true LIBS="$LIBS -ltcmalloc_minimal" @@ -74,14 +63,18 @@ esac],[tcmalloc_enabled=false]) dnl -------------------- dnl Check CC and friends dnl -------------------- +dnl note orig_cflags is also used further down +orig_cflags="$CFLAGS" AC_LANG([C]) AC_PROG_CC AC_PROG_CPP AM_PROG_CC_C_O -AC_PROG_RANLIB -AC_PROG_EGREP +dnl remove autoconf default "-g -O2" +CFLAGS="$orig_cflags" AC_PROG_CC_C99 +AC_PROG_EGREP + dnl autoconf 2.59 appears not to support AC_PROG_SED dnl AC_PROG_SED AC_CHECK_PROG([SED],[sed],[sed],[/bin/false]) @@ -96,25 +89,8 @@ else fi AM_CONDITIONAL([HAVE_LATEX], [test "x$HAVE_LATEX" = "xtrue"]) -if test "x${GCC}" != "xyes" ; then - AC_MSG_CHECKING([whether we are using SunPro compiler]) - AC_EGREP_CPP([^__SUNPRO_C.*0x5(7|8|9)], ["__SUNPRO_C" __SUNPRO_C], - [AC_MSG_RESULT([no])], - [COMPILER="SUNPRO" - AC_MSG_RESULT([yes])] - ) -fi - -dnl --------------------------------------------- -dnl If CLFAGS doesn\'t exist set default value -dnl AC_PROG_CC will have set minimal default -dnl already, eg "-O2 -g" for gcc, "-g" for others -dnl (Wall is gcc specific... have to make sure -dnl gcc is being used before setting it) -dnl -dnl Sun Studio 10 / SunPro 5.7 is also supported, -dnl so lets set some sane CFLAGS for it. -dnl --------------------------------------------- +dnl try and enable CFLAGS that are useful for Quagga +dnl - specifically, options to control warnings AC_USE_SYSTEM_EXTENSIONS() AC_DEFUN([AC_C_FLAG], [{ @@ -138,57 +114,65 @@ AC_DEFUN([AC_C_FLAG], [{ AC_LANG_POP(C) }]) -AC_MSG_CHECKING([whether to set a default CFLAGS]) -if test "x${cflags_specified}" = "x" ; then - case ${COMPILER} in - "SUNPRO") - CFLAGS="-xO4 -v -g -xspace -xcode=pic32 -xstrconst -xc99" - AC_MSG_RESULT([SunPro default]) - ;; - *) - AC_MSG_RESULT([autodetecting]) - - AC_C_FLAG([-diag-error 10006]) - AC_C_FLAG([-g]) - AC_C_FLAG([-Os], [ - AC_C_FLAG([-O2]) - ]) - AC_C_FLAG([-fno-omit-frame-pointer]) - AC_C_FLAG([-Wall]) - AC_C_FLAG([-Wextra]) - AC_C_FLAG([-Wmissing-prototypes]) - AC_C_FLAG([-Wmissing-declarations]) - AC_C_FLAG([-Wpointer-arith]) - AC_C_FLAG([-Wbad-function-cast]) - AC_C_FLAG([-Wwrite-strings]) - if test x"${enable_gcc_ultra_verbose}" = x"yes" ; then - AC_C_FLAG([-Wcast-qual]) - AC_C_FLAG([-Wstrict-prototypes]) - AC_C_FLAG([-Wmissing-noreturn]) - AC_C_FLAG([-Wmissing-format-attribute]) - AC_C_FLAG([-Wunreachable-code]) - AC_C_FLAG([-Wpacked]) - AC_C_FLAG([-Wpadded]) - else - AC_C_FLAG([-Wno-unused-result]) - fi - AC_C_FLAG([-Wno-unused-parameter]) - AC_C_FLAG([-Wno-missing-field-initializers]) - # ICC emits a broken warning for const char *x = a ? "b" : "c"; - # for some reason the string consts get 'promoted' to char *, - # triggering a const to non-const conversion warning. - AC_C_FLAG([-diag-disable 3179]) - ;; - esac +dnl ICC won't bail on unknown options without -diag-error 10006 +dnl need to do this first so we get useful results for the other options +AC_C_FLAG([-diag-error 10006]) + +dnl if the user specified any CFLAGS, we don't add "-g -Os/-O2" here +if test "z$orig_cflags" = "z"; then + AC_C_FLAG([-g]) + AC_C_FLAG([-Os], [ + AC_C_FLAG([-O2]) + ]) +fi + +dnl always want these CFLAGS +AC_C_FLAG([-fno-omit-frame-pointer]) +AC_C_FLAG([-Wall]) +AC_C_FLAG([-Wextra]) +AC_C_FLAG([-Wmissing-prototypes]) +AC_C_FLAG([-Wmissing-declarations]) +AC_C_FLAG([-Wpointer-arith]) +AC_C_FLAG([-Wbad-function-cast]) +AC_C_FLAG([-Wwrite-strings]) +if test x"${enable_gcc_ultra_verbose}" = x"yes" ; then + AC_C_FLAG([-Wcast-qual]) + AC_C_FLAG([-Wstrict-prototypes]) + AC_C_FLAG([-Wmissing-noreturn]) + AC_C_FLAG([-Wmissing-format-attribute]) + AC_C_FLAG([-Wunreachable-code]) + AC_C_FLAG([-Wpacked]) + AC_C_FLAG([-Wpadded]) else - AC_MSG_RESULT([CFLAGS supplied by user]) + AC_C_FLAG([-Wno-unused-result]) fi +AC_C_FLAG([-Wno-unused-parameter]) +AC_C_FLAG([-Wno-missing-field-initializers]) + +dnl ICC emits a broken warning for const char *x = a ? "b" : "c"; +dnl for some reason the string consts get 'promoted' to char *, +dnl triggering a const to non-const conversion warning. +AC_C_FLAG([-diag-disable 3179]) if test x"${enable_werror}" = x"yes" ; then WERROR="-Werror" fi AC_SUBST(WERROR) +dnl need link on this one, not compile +AC_LANG_PUSH(C) +ac_ld_flag_save="$LDFLAGS" +LDFLAGS="$LDFLAGS -rdynamic" +AC_MSG_CHECKING([[whether linker supports -rdynamic]]) +AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]])], + [AC_MSG_RESULT([yes])], + [ + LDFLAGS="$ac_ld_flag_save" + AC_MSG_RESULT([no]) + ]) +AC_LANG_POP(C) + dnl -------------- dnl Check programs dnl -------------- @@ -197,22 +181,6 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AC_CHECK_TOOL(AR, ar) -dnl --------------------------- -dnl We, perhaps unfortunately, -dnl depend on GNU Make specific -dnl constructs. -dnl Give the user a warning if -dnl not GNU Make. -dnl --------------------------- -AC_CACHE_CHECK([if ${MAKE-make} is GNU make], [quagga_cv_gnu_make], - [quagga_cv_gnu_make=no - if ${MAKE-make} --version 2>/dev/null | \ - grep '^GNU Make ' >/dev/null ; then - quagga_cv_gnu_make=yes; - fi - ] -) - dnl ----------------- dnl System extensions dnl ----------------- @@ -291,8 +259,6 @@ AC_ARG_ENABLE(rtadv, AS_HELP_STRING([--disable-rtadv], [disable IPV6 router advertisement feature])) AC_ARG_ENABLE(irdp, AS_HELP_STRING([--enable-irdp], [enable IRDP server support in zebra])) -AC_ARG_ENABLE(isis_topology, - AS_HELP_STRING([--enable-isis-topology], [enable IS-IS topology generator])) AC_ARG_ENABLE(capabilities, AS_HELP_STRING([--disable-capabilities], [disable using POSIX capabilities])) AC_ARG_ENABLE(rusage, @@ -301,8 +267,6 @@ AC_ARG_ENABLE(gcc_ultra_verbose, AS_HELP_STRING([--enable-gcc-ultra-verbose], [enable ultra verbose GCC warnings])) AC_ARG_ENABLE(linux24_tcp_md5, AS_HELP_STRING([--enable-linux24-tcp-md5], [enable support for old, Linux-2.4 RFC2385 patch])) -AC_ARG_ENABLE(gcc-rdynamic, - AS_HELP_STRING([--enable-gcc-rdynamic], [enable linking with -rdynamic for better backtraces (default if gcc)])) AC_ARG_ENABLE(backtrace, AS_HELP_STRING([--disable-backtrace,], [disable crash backtraces (default autodetect)])) AC_ARG_ENABLE(time-check, @@ -336,12 +300,6 @@ fi AC_ARG_ENABLE([dev_build], AS_HELP_STRING([--enable-dev-build], [build for development])) -if test x"${enable_gcc_rdynamic}" != x"no" ; then - if test x"${enable_gcc_rdynamic}" = x"yes" -o x"$COMPILER" = x"GCC"; then - LDFLAGS="${LDFLAGS} -rdynamic" - fi -fi - if test x"${enable_time_check}" != x"no" ; then if test x"${enable_time_check}" = x"yes" -o x"${enable_time_check}" = x ; then AC_DEFINE(CONSUMED_TIME_CHECK,5000000,Consumed Time Check) @@ -470,17 +428,6 @@ if test "${enable_irdp}" = "yes"; then AC_DEFINE(HAVE_IRDP,, IRDP ) fi -if test "${enable_isisd}" != "no" && test "${enable_isis_topology}" = yes; then - AC_DEFINE(TOPOLOGY_GENERATE,,Enable IS-IS topology generator code) - ISIS_TOPOLOGY_INCLUDES="-I\$(srcdir)/topology" - ISIS_TOPOLOGY_DIR="topology" - ISIS_TOPOLOGY_LIB="./topology/libtopology.a" -fi - -AC_SUBST(ISIS_TOPOLOGY_INCLUDES) -AC_SUBST(ISIS_TOPOLOGY_DIR) -AC_SUBST(ISIS_TOPOLOGY_LIB) - if test x"${enable_user}" = x"no"; then enable_user="" else @@ -558,12 +505,8 @@ dnl Check C keywords and standard types dnl ------------------------------------ AC_C_CONST AC_C_INLINE -AC_C_RESTRICT AC_C_VOLATILE AC_HEADER_STDC -AC_HEADER_TIME -AC_HEADER_SYS_WAIT -AC_HEADER_STDBOOL dnl AC_TYPE_PID_T AC_TYPE_UID_T AC_TYPE_MODE_T @@ -573,10 +516,9 @@ AC_STRUCT_TM dnl ------------------------- dnl Check other header files. dnl ------------------------- -AC_CHECK_HEADERS([stropts.h sys/ksym.h sys/times.h sys/select.h \ - sys/types.h linux/version.h netdb.h asm/types.h \ - sys/cdefs.h sys/param.h limits.h signal.h \ - sys/socket.h netinet/in.h time.h sys/time.h]) +AC_CHECK_HEADERS([stropts.h sys/ksym.h \ + linux/version.h asm/types.h \ + sys/cdefs.h]) dnl Utility macro to avoid retyping includes all the time m4_define([QUAGGA_INCLUDES], @@ -585,58 +527,21 @@ m4_define([QUAGGA_INCLUDES], #define __EXTENSIONS__ #endif #include <stdio.h> -#if STDC_HEADERS -# include <stdlib.h> -# include <stddef.h> -#else -# if HAVE_STDLIB_H -# include <stdlib.h> -# endif -#endif -#if HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif +#include <stdlib.h> +#include <stddef.h> +#include <sys/types.h> /* sys/conf.h depends on param.h on FBSD at least */ -#if HAVE_SYS_PARAM_H -# include <sys/param.h> -#endif +#include <sys/param.h> /* Required for MAXSIG */ -#if HAVE_SIGNAL_H -# include <signal.h> -#endif -#if HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif +#include <signal.h> +#include <sys/socket.h> #ifdef __APPLE__ # define __APPLE_USE_RFC_3542 #endif -#if HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef TIME_WITH_SYS_TIME -# include <sys/time.h> -# include <time.h> -#else -# ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -# else -# include <time.h> -# endif -#endif /* TIME_WITH_SYS_TIME */ -])dnl - -dnl HAVE_NET_IF_H must be discovered by the time the longer AC_CHECK_HEADERS -dnl round below execution begins, otherwise it doesn't properly detect -dnl HAVE_NETINET6_IN6_VAR_H, HAVE_NET_IF_VAR_H and HAVE_STRUCT_IN6_ALIASREQ -dnl on FreeBSD (BZ#408). - -AC_CHECK_HEADERS([net/if.h], [], [], QUAGGA_INCLUDES) - -m4_define([QUAGGA_INCLUDES], -QUAGGA_INCLUDES -[#if HAVE_NET_IF_H -# include <net/if.h> -#endif +#include <netinet/in.h> +#include <sys/time.h> +#include <time.h> +#include <net/if.h> ])dnl dnl Same applies for HAVE_NET_IF_VAR_H, which HAVE_NETINET6_ND6_H and @@ -652,10 +557,9 @@ QUAGGA_INCLUDES #endif ])dnl -AC_CHECK_HEADERS([sys/un.h netinet/in_systm.h netinet/in_var.h \ - net/if_dl.h net/netopt.h net/route.h \ - inet/nd.h arpa/inet.h netinet/ip_icmp.h \ - fcntl.h stddef.h sys/ioctl.h syslog.h wchar.h wctype.h \ +AC_CHECK_HEADERS([netinet/in_var.h \ + net/if_dl.h net/netopt.h \ + inet/nd.h netinet/ip_icmp.h \ sys/sysctl.h sys/sockio.h kvm.h sys/conf.h], [], [], QUAGGA_INCLUDES) @@ -680,12 +584,9 @@ AC_CHECK_MEMBERS([ucontext_t.uc_mcontext.gregs], m4_define([QUAGGA_INCLUDES], QUAGGA_INCLUDES -[#if HAVE_SYS_UN_H -# include <sys/un.h> -#endif -#if HAVE_NETINET_IN_SYSTM_H -# include <netinet/in_systm.h> -#endif +[ +#include <sys/un.h> +#include <netinet/in_systm.h> #if HAVE_NETINET_IN_VAR_H # include <netinet/in_var.h> #endif @@ -695,15 +596,11 @@ QUAGGA_INCLUDES #if HAVE_NET_NETOPT_H # include <net/netopt.h> #endif -#if HAVE_NET_ROUTE_H -# include <net/route.h> -#endif +#include <net/route.h> #if HAVE_INET_ND_H # include <inet/nd.h> #endif -#if HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif +#include <arpa/inet.h> /* Required for IDRP */ #if HAVE_NETINET_IP_ICMP_H # include <netinet/ip_icmp.h> @@ -874,20 +771,10 @@ dnl AC_CHECK_SIZEOF(long) dnl ---------------------------- dnl check existance of functions dnl ---------------------------- -AC_FUNC_CHOWN AC_FUNC_FNMATCH AC_FUNC_FORK -AC_FUNC_MEMCMP AC_FUNC_MKTIME -AC_FUNC_STRFTIME AC_FUNC_STAT -AC_FUNC_SELECT_ARGTYPES -AC_FUNC_STRFTIME -dnl Avoid AC_FUNC_STRNLEN because it pulls in AC_SYSTEM_EXTENSIONS which -dnl can lead to strange side effects. So we just check for strnlen -dnl directly, see below. -dnl AC_FUNC_STRNLENdnl -AC_FUNC_VPRINTF dnl ------------------------------- dnl bgpd needs pow() and hence libm @@ -910,22 +797,17 @@ AC_SUBST(LIBM) dnl --------------- dnl other functions dnl --------------- -AC_CHECK_FUNCS([dup2 ftruncate getcwd gethostbyname getpagesize gettimeofday \ - inet_ntoa inet_aton strnlen \ - memchr memmove memset select socket \ - strcasecmp strchr strcspn strdup strerror \ - strncasecmp strndup strrchr strspn strstr \ - strtol strtoul strlcat strlcpy \ - daemon snprintf vsnprintf \ - if_nametoindex if_indextoname getifaddrs \ - uname fcntl getgrouplist pledge]) +AC_CHECK_FUNCS([ \ + strlcat strlcpy \ + getgrouplist \ + pledge]) AC_CHECK_HEADER([asm-generic/unistd.h], [AC_CHECK_DECL(__NR_setns, AC_DEFINE(HAVE_NETNS,, Have netns),, QUAGGA_INCLUDES [#include <asm-generic/unistd.h> ]) - AC_CHECK_FUNCS(setns, AC_DEFINE(HAVE_SETNS,, Have setns))] + AC_CHECK_FUNCS(setns)] ) dnl ------------------------------------ @@ -989,15 +871,9 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ #define _XPG4_2 #define __EXTENSIONS__ #endif -#ifdef HAVE_STDLIB_H -# include <stdlib.h> -#endif -#ifdef HAVE_SYS_TYPES_H +#include <stdlib.h> #include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> -#endif main() { @@ -1072,12 +948,8 @@ dnl --------------------------------------------------------------- AC_CHECK_MEMBERS([struct ip_mreqn.imr_ifindex], [], [], QUAGGA_INCLUDES) AC_CHECK_HEADERS([linux/mroute.h], [], [],[ - #ifdef HAVE_SYS_SOCKET_H - # include <sys/socket.h> - #endif - #ifdef HAVE_NETINET_IN_H - # include <netinet/in.h> - #endif + #include <sys/socket.h> + #include <netinet/in.h> #define _LINUX_IN_H /* For Linux <= 2.6.25 */ #include <linux/types.h> ]) @@ -1090,18 +962,10 @@ QUAGGA_INCLUDES ])dnl AC_CHECK_HEADERS([netinet/ip_mroute.h], [], [],[ - #ifdef HAVE_SYS_SOCKET_H - # include <sys/socket.h> - #endif - #ifdef HAVE_SYS_TYPES_H - # include <sys/types.h> - #endif - #ifdef HAVE_NETINET_IN_H - # include <netinet/in.h> - #endif - #ifdef HAVE_NET_ROUTE_H - # include <net/route.h> - #endif + #include <sys/socket.h> + #include <sys/types.h> + #include <netinet/in.h> + #include <net/route.h> ]) m4_define([QUAGGA_INCLUDES], @@ -1112,9 +976,8 @@ QUAGGA_INCLUDES ])dnl AC_MSG_CHECKING([for BSD struct ip_mreq hack]) -AC_TRY_COMPILE([#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif],[#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__sun) +AC_TRY_COMPILE([#include <sys/param.h>], +[#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__sun) return (0); #else #error No support for BSD struct ip_mreq hack detected @@ -1134,28 +997,24 @@ AC_MSG_RESULT(no)) dnl --------------------------------------------------------------- dnl figure out how to check link-state dnl --------------------------------------------------------------- -AC_CHECK_HEADER([net/if.h], - [AC_CHECK_HEADER( [net/if_media.h], - [m4_define([LINK_DETECT_INCLUDES], - QUAGGA_INCLUDES - [#include <net/if_media.h> - ]) - AC_CHECK_MEMBERS( [struct ifmediareq.ifm_status], - AC_DEFINE(HAVE_BSD_LINK_DETECT,,[BSD link-detect]), - [], LINK_DETECT_INCLUDES)], - [], - QUAGGA_INCLUDES)], - [], QUAGGA_INCLUDES ) +AC_CHECK_HEADER( [net/if_media.h], + [m4_define([LINK_DETECT_INCLUDES], + QUAGGA_INCLUDES + [#include <net/if_media.h> + ]) + AC_CHECK_MEMBERS( [struct ifmediareq.ifm_status], + AC_DEFINE(HAVE_BSD_LINK_DETECT,,[BSD link-detect]), + [], LINK_DETECT_INCLUDES)], + [], + QUAGGA_INCLUDES) dnl --------------------------------------------------------------- dnl Additional, newer way to check link-state using ifi_link_state. dnl Not available in all BSD's when ifmediareq available dnl --------------------------------------------------------------- -AC_CHECK_HEADER([net/if.h], - AC_CHECK_MEMBERS([struct if_data.ifi_link_state], - AC_DEFINE(HAVE_BSD_IFI_LINK_STATE,,[BSD ifi_link_state available]), - [], QUAGGA_INCLUDES), - ,) +AC_CHECK_MEMBERS([struct if_data.ifi_link_state], + AC_DEFINE(HAVE_BSD_IFI_LINK_STATE,,[BSD ifi_link_state available]), + [], QUAGGA_INCLUDES) dnl ------------------------ dnl TCP_MD5SIG socket option @@ -1206,8 +1065,6 @@ esac]) IPFORWARD=ipforward_${quagga_cv_ipforward_method}.o AC_SUBST(IPFORWARD) -AC_CHECK_FUNCS(getaddrinfo, [have_getaddrinfo=yes], [have_getaddrinfo=no]) - dnl ---------------------------------------------------------------------------- dnl figure out if domainname is available in the utsname struct (GNU extension). dnl ---------------------------------------------------------------------------- @@ -1251,7 +1108,7 @@ AC_DEFINE(HAVE_IPV6,1,IPv6) dnl ------------------ dnl IPv6 header checks dnl ------------------ -AC_CHECK_HEADERS([netinet6/in6.h netinet/in6_var.h netinet/icmp6.h \ +AC_CHECK_HEADERS([netinet6/in6.h netinet/in6_var.h \ netinet6/in6_var.h netinet6/nd6.h], [], [], QUAGGA_INCLUDES) @@ -1263,9 +1120,7 @@ QUAGGA_INCLUDES #if HAVE_NETINET_IN6_VAR_H #include <netinet/in6_var.h> #endif -#if HAVE_NETINET_ICMP6_H -# include <netinet/icmp6.h> -#endif +#include <netinet/icmp6.h> #if HAVE_NETINET6_IN6_VAR_H # include <netinet6/in6_var.h> #endif @@ -1408,8 +1263,6 @@ AC_SUBST(VTYSH) AC_SUBST(CURSES) AC_SUBST(OSPFCLIENT) AC_SUBST(OSPFAPI) -AC_CHECK_LIB(c, inet_ntop, [AC_DEFINE(HAVE_INET_NTOP,,inet_ntop)]) -AC_CHECK_LIB(c, inet_pton, [AC_DEFINE(HAVE_INET_PTON,,inet_pton)]) AC_CHECK_LIB(crypt, crypt) AC_CHECK_LIB(resolv, res_init) @@ -1420,19 +1273,7 @@ if test "x$enable_pcreposix" = "xyes"; then AC_CHECK_LIB(pcreposix, pcreposix_regexec, ,[enable_pcreposix=no AC_MSG_WARN([*** falling back to other regex library ***]) ]) fi - -if test "x$enable_pcreposix" != "xyes"; then -dnl --------------------------- -dnl check system has GNU regexp -dnl --------------------------- -AC_MSG_CHECKING(whether system has GNU regex) -AC_CHECK_LIB(c, regexec, -[AC_DEFINE(HAVE_GNU_REGEX,,GNU regexp library) - LIB_REGEX=""], -[LIB_REGEX="regex.o"]) -fi AC_SUBST(HAVE_LIBPCREPOSIX) -AC_SUBST(LIB_REGEX) dnl ------------------ dnl check Net-SNMP library @@ -1475,9 +1316,9 @@ fi dnl --------------------------- dnl sockaddr and netinet checks dnl --------------------------- -AC_CHECK_TYPES([struct sockaddr, struct sockaddr_in, - struct sockaddr_in6, struct sockaddr_un, struct sockaddr_dl, - socklen_t, struct vifctl, struct mfcctl, struct sioc_sg_req, +AC_CHECK_TYPES([ + struct sockaddr_dl, + struct vifctl, struct mfcctl, struct sioc_sg_req, vifi_t, struct sioc_vif_req, struct igmpmsg, struct ifaliasreq, struct if6_aliasreq, struct in6_aliasreq, struct nd_opt_adv_interval, struct rt_addrinfo, @@ -1486,7 +1327,6 @@ AC_CHECK_TYPES([struct sockaddr, struct sockaddr_in, AC_CHECK_MEMBERS([struct sockaddr.sa_len, struct sockaddr_in.sin_len, struct sockaddr_un.sun_len, - struct sockaddr_in6.sin6_scope_id, struct sockaddr_dl.sdl_len, struct if6_aliasreq.ifra_lifetime, struct nd_opt_adv_interval.nd_opt_ai_type], @@ -1573,17 +1413,6 @@ AC_TRY_COMPILE([#include <netinet/in.h>], [ ]) dnl -------------------------------------- -dnl checking for getrusage struct and call -dnl -------------------------------------- -if test "${enable_rusage}" != "no"; then - AC_MSG_CHECKING(whether getrusage is available) - AC_TRY_COMPILE([#include <sys/resource.h>],[struct rusage ac_x; getrusage (RUSAGE_SELF, &ac_x);], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_RUSAGE,,rusage)], - AC_MSG_RESULT(no)) -fi - -dnl -------------------------------------- dnl checking for clock_time monotonic struct and call dnl -------------------------------------- AC_CHECK_DECL(CLOCK_MONOTONIC, @@ -1794,7 +1623,6 @@ AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile redhat/quagga.spec lib/version.h doc/defines.texi - isisd/topology/Makefile pkgsrc/bgpd.sh pkgsrc/ospf6d.sh pkgsrc/ospfd.sh pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh]) @@ -1836,10 +1664,3 @@ zebra protobuf enabled : ${have_protobuf:-no} The above user and group must have read/write access to the state file directory and to the config files in the config file directory." - -if test x"$quagga_cv_gnu_make" = x"no"; then echo " -Warning: The ${MAKE-make} programme detected, either in your path or -via the MAKE variable, is not GNU Make. GNU make may be installed as -gmake on some systems. and is required to complete a build of Quagga -" > /dev/stderr -fi diff --git a/isisd/Makefile.am b/isisd/Makefile.am index 69624dced3..05f96c3807 100644 --- a/isisd/Makefile.am +++ b/isisd/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in. AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib \ - @ISIS_TOPOLOGY_INCLUDES@ -DVTY_DEPRECATE_INDEX + -DVTY_DEPRECATE_INDEX DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" INSTALL_SDATA=@INSTALL@ -m 600 LIBS = @LIBS@ @@ -10,7 +10,6 @@ AM_CFLAGS = $(WERROR) noinst_LIBRARIES = libisis.a sbin_PROGRAMS = isisd -SUBDIRS = topology libisis_a_SOURCES = \ isis_memory.c \ @@ -27,14 +26,13 @@ noinst_HEADERS = \ isis_lsp.h dict.h isis_circuit.h isis_misc.h isis_network.h \ isis_zebra.h isis_dr.h isis_flags.h isis_dynhn.h isis_common.h \ iso_checksum.h isis_csm.h isis_events.h isis_spf.h isis_redist.h \ - isis_route.h isis_routemap.h isis_te.h \ - include-netbsd/clnp.h include-netbsd/esis.h include-netbsd/iso.h + isis_route.h isis_routemap.h isis_te.h isisd_SOURCES = \ isis_main.c $(libisis_a_SOURCES) \ isis_bpf.c isis_dlpi.c isis_pfpacket.c -isisd_LDADD = @ISIS_TOPOLOGY_LIB@ ../lib/libzebra.la @LIBCAP@ +isisd_LDADD = ../lib/libzebra.la @LIBCAP@ examplesdir = $(exampledir) dist_examples_DATA = isisd.conf.sample diff --git a/isisd/include-netbsd/.gitignore b/isisd/include-netbsd/.gitignore deleted file mode 100644 index dd5bf7c67c..0000000000 --- a/isisd/include-netbsd/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.arch-inventory -.arch-ids - -*~ -*.loT - diff --git a/isisd/include-netbsd/clnp.h b/isisd/include-netbsd/clnp.h deleted file mode 100644 index 6bc3d25721..0000000000 --- a/isisd/include-netbsd/clnp.h +++ /dev/null @@ -1,547 +0,0 @@ -/* $NetBSD: clnp.h,v 1.13 2001/08/20 12:00:54 wiz Exp $ */
-
-/*-
- * Copyright (c) 1991, 1993, 1994
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)clnp.h 8.2 (Berkeley) 4/16/94
- */
-
-/***********************************************************
- Copyright IBM Corporation 1987
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of IBM not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
- * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
- */
-
-/* should be config option but cpp breaks with too many #defines */
-#define DECBIT
-
-/*
- * Return true if the mbuf is a cluster mbuf
- */
-#define IS_CLUSTER(m) ((m)->m_flags & M_EXT)
-
-/*
- * Move the halfword into the two characters
- */
-#define HTOC(msb, lsb, hword)\
- (msb) = (u_char)((hword) >> 8);\
- (lsb) = (u_char)((hword) & 0xff)
-/*
- * Move the two charcters into the halfword
- */
-#define CTOH(msb, lsb, hword)\
- (hword) = ((msb) << 8) | (lsb)
-
-/*
- * Return true if the checksum has been set - ie. the checksum is
- * not zero
- */
-#define CKSUM_REQUIRED(clnp)\
- (((clnp)->cnf_cksum_msb != 0) || ((clnp)->cnf_cksum_lsb != 0))
-
-/*
- * Fixed part of clnp header
- */
-struct clnp_fixed {
- u_char cnf_proto_id; /* network layer protocol identifier */
- u_char cnf_hdr_len; /* length indicator (octets) */
- u_char cnf_vers; /* version/protocol identifier
- * extension */
- u_char cnf_ttl;/* lifetime (500 milliseconds) */
- u_char cnf_type; /* type code */
- /* Includes err_ok, more_segs, and seg_ok */
- u_char cnf_seglen_msb; /* pdu segment length (octets) high
- * byte */
- u_char cnf_seglen_lsb; /* pdu segment length (octets) low
- * byte */
- u_char cnf_cksum_msb; /* checksum high byte */
- u_char cnf_cksum_lsb; /* checksum low byte */
-} __attribute__((packed));
-#define CNF_TYPE 0x1f
-#define CNF_ERR_OK 0x20
-#define CNF_MORE_SEGS 0x40
-#define CNF_SEG_OK 0x80
-
-#define CLNP_CKSUM_OFF 0x07 /* offset of checksum */
-
-#define clnl_fixed clnp_fixed
-
-/*
- * Segmentation part of clnp header
- */
-struct clnp_segment {
- u_short cng_id; /* data unit identifier */
- u_short cng_off;/* segment offset */
- u_short cng_tot_len; /* total length */
-};
-
-/*
- * Clnp fragment reassembly structures:
- *
- * All packets undergoing reassembly are linked together in
- * clnp_fragl structures. Each clnp_fragl structure contains a
- * pointer to the original clnp packet header, as well as a
- * list of packet fragments. Each packet fragment
- * is headed by a clnp_frag structure. This structure contains the
- * offset of the first and last byte of the fragment, as well as
- * a pointer to the data (an mbuf chain) of the fragment.
- */
-
-/*
- * NOTE:
- * The clnp_frag structure is stored in an mbuf immedately
- * preceding the fragment data. Since there are words in
- * this struct, it must be word aligned.
- *
- * NOTE:
- * All the fragment code assumes that the entire clnp header is
- * contained in the first mbuf.
- */
-struct clnp_frag {
- u_int cfr_first; /* offset of first byte of this frag */
- u_int cfr_last; /* offset of last byte of this frag */
- u_int cfr_bytes; /* bytes to shave to get to data */
- struct mbuf *cfr_data; /* ptr to data for this frag */
- struct clnp_frag *cfr_next; /* next fragment in list */
-};
-
-struct clnp_fragl {
- struct iso_addr cfl_src;/* source of the pkt */
- struct iso_addr cfl_dst;/* destination of the pkt */
- u_short cfl_id; /* id of the pkt */
- u_char cfl_ttl;/* current ttl of pkt */
- u_short cfl_last; /* offset of last byte of packet */
- struct mbuf *cfl_orighdr; /* ptr to original header */
- struct clnp_frag *cfl_frags; /* linked list of fragments for pkt */
- struct clnp_fragl *cfl_next; /* next pkt being reassembled */
-};
-
-/*
- * The following structure is used to index into an options section
- * of a clnp datagram. These values can be used without worry that
- * offset or length fields are invalid or too big, etc. That is,
- * the consistancy of the options will be guaranteed before this
- * structure is filled in. Any pointer (field ending in p) is
- * actually the offset from the beginning of the mbuf the option
- * is contained in. A value of NULL for any pointer
- * means that the option is not present. The length any option
- * does not include the option code or option length fields.
- */
-struct clnp_optidx {
- u_short cni_securep; /* ptr to start of security option */
- char cni_secure_len; /* length of entire security option */
-
- u_short cni_srcrt_s; /* offset of start of src rt option */
- u_short cni_srcrt_len; /* length of entire src rt option */
-
- u_short cni_recrtp; /* ptr to beginning of recrt option */
- char cni_recrt_len; /* length of entire recrt option */
-
- char cni_priorp; /* ptr to priority option */
-
- u_short cni_qos_formatp; /* ptr to format of qos
- * option */
- char cni_qos_len; /* length of entire qos option */
-
- u_char cni_er_reason; /* reason from ER pdu option */
-
- /* ESIS options */
-
- u_short cni_esct; /* value from ISH ESCT option */
-
- u_short cni_netmaskp; /* ptr to beginning of netmask option */
- char cni_netmask_len; /* length of entire netmask
- * option */
-
- u_short cni_snpamaskp; /* ptr to start of snpamask option */
- char cni_snpamask_len; /* length of entire snpamask
- * option */
-
-};
-
-#define ER_INVALREAS 0xff /* code for invalid ER pdu discard reason */
-
-/* given an mbuf and addr of option, return offset from data of mbuf */
-#define CLNP_OPTTOOFF(m, opt) ((u_short) (opt - mtod(m, caddr_t)))
-
-/* given an mbuf and offset of option, return address of option */
-#define CLNP_OFFTOOPT(m, off) ((caddr_t) (mtod(m, caddr_t) + off))
-
-/* return true iff src route is valid */
-#define CLNPSRCRT_VALID(oidx) ((oidx) && (oidx->cni_srcrt_s))
-
-/* return the offset field of the src rt */
-#define CLNPSRCRT_OFF(oidx, options)\
- (*((u_char *)(CLNP_OFFTOOPT(options, oidx->cni_srcrt_s) + 1)))
-
-/* return the type field of the src rt */
-#define CLNPSRCRT_TYPE(oidx, options)\
- ((u_char)(*(CLNP_OFFTOOPT(options, oidx->cni_srcrt_s))))
-
-/* return the length of the current address */
-#define CLNPSRCRT_CLEN(oidx, options)\
- ((u_char)(*(CLNP_OFFTOOPT(options, oidx->cni_srcrt_s) + CLNPSRCRT_OFF(oidx, options) - 1)))
-
-/* return the address of the current address */
-#define CLNPSRCRT_CADDR(oidx, options)\
- ((caddr_t)(CLNP_OFFTOOPT(options, oidx->cni_srcrt_s) + CLNPSRCRT_OFF(oidx, options)))
-
-/*
- * return true if the src route has run out of routes this is true if the
- * offset of next route is greater than the end of the rt
- */
-#define CLNPSRCRT_TERM(oidx, options)\
- (CLNPSRCRT_OFF(oidx, options) > oidx->cni_srcrt_len)
-
-/*
- * Options a user can set/get
- */
-#define CLNPOPT_FLAGS 0x01 /* flags: seg permitted, no er xmit, etc */
-#define CLNPOPT_OPTS 0x02 /* datagram options */
-
-/*
- * Values for particular datagram options
- */
-#define CLNPOVAL_PAD 0xcc /* padding */
-#define CLNPOVAL_SECURE 0xc5 /* security */
-#define CLNPOVAL_SRCRT 0xc8 /* source routing */
-#define CLNPOVAL_RECRT 0xcb /* record route */
-#define CLNPOVAL_QOS 0xc3 /* quality of service */
-#define CLNPOVAL_PRIOR 0xcd /* priority */
-#define CLNPOVAL_ERREAS 0xc1 /* ER PDU ONLY: reason for discard */
-
-#define CLNPOVAL_SRCSPEC 0x40 /* source address specific */
-#define CLNPOVAL_DSTSPEC 0x80 /* destination address specific */
-#define CLNPOVAL_GLOBAL 0xc0 /* globally unique */
-
-/* Globally Unique QOS */
-#define CLNPOVAL_SEQUENCING 0x10 /* sequencing preferred */
-#define CLNPOVAL_CONGESTED 0x08 /* congestion experienced */
-#define CLNPOVAL_LOWDELAY 0x04 /* low transit delay */
-
-#define CLNPOVAL_PARTRT 0x00 /* partial source routing */
-#define CLNPOVAL_COMPRT 0x01 /* complete source routing */
-
-/*
- * Clnp flags used in a control block flags field.
- * NOTE: these must be out of the range of bits defined in ../net/raw_cb.h
- */
-#define CLNP_NO_SEG 0x010 /* segmentation not permitted */
-#define CLNP_NO_ER 0x020 /* do not generate ERs */
-#define CLNP_SEND_RAW 0x080 /* send pkt as RAW DT not TP DT */
-#define CLNP_NO_CKSUM 0x100 /* don't use clnp checksum */
-#define CLNP_ECHO 0x200 /* send echo request */
-#define CLNP_NOCACHE 0x400 /* don't store cache information */
-#define CLNP_ECHOR 0x800 /* send echo reply */
-
-/* valid clnp flags */
-#define CLNP_VFLAGS \
- (CLNP_SEND_RAW|CLNP_NO_SEG|CLNP_NO_ER|CLNP_NO_CKSUM|\
- CLNP_ECHO|CLNP_NOCACHE|CLNP_ECHOR)
-
-/*
- * Constants used by clnp
- */
-#define CLNP_HDR_MIN (sizeof (struct clnp_fixed))
-#define CLNP_HDR_MAX (254)
-#define CLNP_TTL_UNITS 2 /* 500 milliseconds */
-#define CLNP_TTL 15*CLNP_TTL_UNITS /* time to live (seconds) */
-#define ISO8473_V1 0x01
-
-/*
- * Clnp packet types
- * In order to test raw clnp and tp/clnp simultaneously, a third type of
- * packet has been defined: CLNP_RAW. This is done so that the input
- * routine can switch to the correct input routine (rclnp_input or
- * tpclnp_input) based on the type field. If clnp had a higher level
- * protocol field, this would not be necessary.
- */
-#define CLNP_DT 0x1C /* normal data */
-#define CLNP_ER 0x01 /* error report */
-#define CLNP_RAW 0x1D /* debug only */
-#define CLNP_EC 0x1E /* echo packet */
-#define CLNP_ECR 0x1F /* echo reply */
-
-/*
- * ER pdu error codes
- */
-#define GEN_NOREAS 0x00 /* reason not specified */
-#define GEN_PROTOERR 0x01 /* protocol procedure error */
-#define GEN_BADCSUM 0x02 /* incorrect checksum */
-#define GEN_CONGEST 0x03 /* pdu discarded due to congestion */
-#define GEN_HDRSYNTAX 0x04 /* header syntax error */
-#define GEN_SEGNEEDED 0x05 /* need segmentation but not allowed */
-#define GEN_INCOMPLETE 0x06 /* incomplete pdu received */
-#define GEN_DUPOPT 0x07 /* duplicate option */
-
-/* address errors */
-#define ADDR_DESTUNREACH 0x80 /* destination address unreachable */
-#define ADDR_DESTUNKNOWN 0x81 /* destination address unknown */
-
-/* source routing */
-#define SRCRT_UNSPECERR 0x90 /* unspecified src rt error */
-#define SRCRT_SYNTAX 0x91 /* syntax error in src rt field */
-#define SRCRT_UNKNOWNADDR 0x92 /* unknown addr in src rt field */
-#define SRCRT_BADPATH 0x93 /* path not acceptable */
-
-/* lifetime */
-#define TTL_EXPTRANSIT 0xa0 /* lifetime expired during transit */
-#define TTL_EXPREASS 0xa1 /* lifetime expired during reassembly */
-
-/* pdu discarded */
-#define DISC_UNSUPPOPT 0xb0 /* unsupported option not specified? */
-#define DISC_UNSUPPVERS 0xb1 /* unsupported protocol version */
-#define DISC_UNSUPPSECURE 0xb2 /* unsupported security option */
-#define DISC_UNSUPPSRCRT 0xb3 /* unsupported src rt option */
-#define DISC_UNSUPPRECRT 0xb4 /* unsupported rec rt option */
-
-/* reassembly */
-#define REASS_INTERFERE 0xc0 /* reassembly interference */
-#define CLNP_ERRORS 22
-
-
-#ifdef CLNP_ER_CODES
-u_char clnp_er_codes[CLNP_ERRORS] = {
- GEN_NOREAS, GEN_PROTOERR, GEN_BADCSUM, GEN_CONGEST,
- GEN_HDRSYNTAX, GEN_SEGNEEDED, GEN_INCOMPLETE, GEN_DUPOPT,
- ADDR_DESTUNREACH, ADDR_DESTUNKNOWN,
- SRCRT_UNSPECERR, SRCRT_SYNTAX, SRCRT_UNKNOWNADDR, SRCRT_BADPATH,
- TTL_EXPTRANSIT, TTL_EXPREASS,
- DISC_UNSUPPOPT, DISC_UNSUPPVERS, DISC_UNSUPPSECURE,
- DISC_UNSUPPSRCRT, DISC_UNSUPPRECRT, REASS_INTERFERE
-};
-#endif
-
-#ifdef TROLL
-
-#define TR_DUPEND 0x01 /* duplicate end of fragment */
-#define TR_DUPPKT 0x02 /* duplicate entire packet */
-#define TR_DROPPKT 0x04 /* drop packet on output */
-#define TR_TRIM 0x08 /* trim bytes from packet */
-#define TR_CHANGE 0x10 /* change bytes in packet */
-#define TR_MTU 0x20 /* delta to change device mtu */
-#define TR_CHUCK 0x40 /* drop packet in rclnp_input */
-#define TR_BLAST 0x80 /* force rclnp_output to blast many
- * packet */
-#define TR_RAWLOOP 0x100 /* make if_loop call clnpintr
- * directly */
-struct troll {
- int tr_ops; /* operations to perform */
- float tr_dup_size; /* % to duplicate */
- float tr_dup_freq; /* frequency to duplicate packets */
- float tr_drop_freq; /* frequence to drop packets */
- int tr_mtu_adj; /* delta to adjust if mtu */
- int tr_blast_cnt; /* # of pkts to blast out */
-};
-
-#define SN_OUTPUT(clcp, m)\
- troll_output(clcp->clc_ifp, m, clcp->clc_firsthop, clcp->clc_rt)
-
-#define SN_MTU(ifp, rt) (((rt && rt->rt_rmx.rmx_mtu) ?\
- rt->rt_rmx.rmx_mtu : clnp_badmtu(ifp, rt, __LINE__, __FILE__))\
- - trollctl.tr_mtu_adj)
-
-#ifdef _KERNEL
-extern float troll_random;
-#endif
-
-#else /* NO TROLL */
-
-#define SN_OUTPUT(clcp, m)\
- (*clcp->clc_ifp->if_output)(clcp->clc_ifp, m, clcp->clc_firsthop, \
- clcp->clc_rt)
-
-#define SN_MTU(ifp, rt) (((rt && rt->rt_rmx.rmx_mtu) ?\
- rt->rt_rmx.rmx_mtu : clnp_badmtu(ifp, rt, __LINE__, __FILE__)))
-
-#endif /* TROLL */
-
-/*
- * Macro to remove an address from a clnp header
- */
-#define CLNP_EXTRACT_ADDR(isoa, hoff, hend)\
- {\
- isoa.isoa_len = (u_char)*hoff;\
- if ((((++hoff) + isoa.isoa_len) > hend) ||\
- (isoa.isoa_len > 20) || (isoa.isoa_len == 0)) {\
- hoff = (caddr_t)0;\
- } else {\
- (void) bcopy(hoff, (caddr_t)isoa.isoa_genaddr, \
- isoa.isoa_len);\
- hoff += isoa.isoa_len;\
- }\
- }
-
-/*
- * Macro to insert an address into a clnp header
- */
-#define CLNP_INSERT_ADDR(hoff, isoa)\
- *hoff++ = (isoa).isoa_len;\
- (void) bcopy((caddr_t)((isoa).isoa_genaddr), hoff, (isoa).isoa_len);\
- hoff += (isoa).isoa_len;
-
-/*
- * Clnp hdr cache. Whenever a clnp packet is sent, a copy of the
- * header is made and kept in this cache. In addition to a copy of
- * the cached clnp hdr, the cache contains
- * information necessary to determine whether the new packet
- * to send requires a new header to be built.
- */
-struct clnp_cache {
- /* these fields are used to check the validity of the cache */
- struct iso_addr clc_dst;/* destination of packet */
- struct mbuf *clc_options; /* ptr to options mbuf */
- int clc_flags; /* flags passed to clnp_output */
-
- /* these fields are state that clnp_output requires to finish the pkt */
- int clc_segoff; /* offset of seg part of header */
- struct rtentry *clc_rt; /* ptr to rtentry (points into the route
- * structure) */
- struct sockaddr *clc_firsthop; /* first hop of packet */
- struct ifnet *clc_ifp;/* ptr to interface structure */
- struct iso_ifaddr
- *clc_ifa;/* ptr to interface address */
- struct mbuf *clc_hdr;/* cached pkt hdr (finally)! */
-};
-
-#ifdef _KERNEL
-struct iso_addr;
-struct sockaddr_iso;
-struct mbuf;
-struct clnp_segment;
-struct sockaddr;
-struct rt_entry;
-struct clnp_fragl;
-struct clnp_optidx;
-struct isopcb;
-struct snpa_hdr;
-struct iso_ifaddr;
-struct route_iso;
-
-/* clnp_debug.c */
-char *clnp_hexp __P((char *, int, char *));
-char *clnp_iso_addrp __P((struct iso_addr *));
-char *clnp_saddr_isop __P((struct sockaddr_iso *));
-
-/* clnp_er.c */
-void clnp_er_input __P((struct mbuf *, struct iso_addr *, u_int));
-void clnp_discard __P((struct mbuf *, u_int));
-void clnp_emit_er __P((struct mbuf *, u_int));
-int clnp_er_index __P((u_int));
-
-int clnp_fragment __P((struct ifnet *, struct mbuf *, struct sockaddr *,
- int, int, int, struct rtentry *));
-struct mbuf *clnp_reass __P((struct mbuf *, struct iso_addr *,
- struct iso_addr *, struct clnp_segment *));
-int clnp_newpkt __P((struct mbuf *, struct iso_addr *, struct iso_addr *,
- struct clnp_segment *));
-void clnp_insert_frag __P((struct clnp_fragl *, struct mbuf *,
- struct clnp_segment *));
-struct mbuf *clnp_comp_pdu __P((struct clnp_fragl *));
-#ifdef TROLL
-float troll_random __P((void));
-int troll_output __P((struct ifnet *, struct mbuf *, struct sockaddr *,
- struct rtentry *));
-#endif
-
-/* clnp_input.c */
-void clnp_init __P((void));
-void clnlintr __P((void));
-void clnp_input __P((struct mbuf *, ...));
-
-/* clnp_options.c */
-void clnp_update_srcrt __P((struct mbuf *, struct clnp_optidx *));
-void clnp_dooptions __P((struct mbuf *, struct clnp_optidx *, struct ifnet *,
- struct iso_addr *));
-int clnp_set_opts __P((struct mbuf **, struct mbuf **));
-int clnp_opt_sanity __P((struct mbuf *, caddr_t, int, struct clnp_optidx *));
-
-/* clnp_output.c */
-int clnp_output __P((struct mbuf *, ...));
-void clnp_ctloutput __P((void));
-
-/* clnp_raw.c */
-void rclnp_input __P((struct mbuf *, ...));
-int rclnp_output __P((struct mbuf *, ...));
-int rclnp_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-int clnp_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *,
- struct mbuf *, struct proc *));
-
-/* clnp_subr.c */
-struct mbuf *clnp_data_ck __P((struct mbuf *, int));
-caddr_t clnp_extract_addr __P((caddr_t, int, struct iso_addr *,
- struct iso_addr *));
-int clnp_ours __P((struct iso_addr *));
-void clnp_forward __P((struct mbuf *, int, struct iso_addr *,
- struct clnp_optidx *, int, struct snpa_hdr *));
-caddr_t clnp_insert_addr __P((caddr_t, struct iso_addr *, struct iso_addr *));
-int clnp_route __P((struct iso_addr *, struct route_iso *, int,
- struct sockaddr **, struct iso_ifaddr **));
-int clnp_srcroute __P((struct mbuf *, struct clnp_optidx *, struct route_iso *,
- struct sockaddr **, struct iso_ifaddr **,
- struct iso_addr *));
-int clnp_echoreply __P((struct mbuf *, int, struct sockaddr_iso *,
- struct sockaddr_iso *, struct clnp_optidx *));
-int clnp_badmtu __P((struct ifnet *, struct rtentry *, int, char *));
-void clnp_ypocb __P((caddr_t, caddr_t, u_int));
-
-/* clnp_timer.c */
-struct clnp_fragl *clnp_freefrags __P((struct clnp_fragl *));
-void clnp_slowtimo __P((void));
-void clnp_drain __P((void));
-
-#ifdef TROLL
-struct troll trollctl;
-#endif /* TROLL */
-
-#endif /* _KERNEL */
diff --git a/isisd/include-netbsd/esis.h b/isisd/include-netbsd/esis.h deleted file mode 100644 index ded864e6a6..0000000000 --- a/isisd/include-netbsd/esis.h +++ /dev/null @@ -1,146 +0,0 @@ -/* $NetBSD: esis.h,v 1.11 1997/11/03 15:01:19 is Exp $ */
-
-/*-
- * Copyright (c) 1991, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)esis.h 8.1 (Berkeley) 6/10/93
- */
-
-/***********************************************************
- Copyright IBM Corporation 1987
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of IBM not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
- * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
- */
-
-#include <machine/endian.h>
-
-#define SNPAC_AGE 60 /* seconds */
-#define ESIS_CONFIG 60 /* seconds */
-#define ESIS_HT (ESIS_CONFIG * 2)
-
-/*
- * Fixed part of an ESIS header
- */
-struct esis_fixed {
- u_char esis_proto_id; /* network layer protocol identifier */
- u_char esis_hdr_len; /* length indicator (octets) */
- u_char esis_vers; /* version/protocol identifier
- * extension */
- u_char esis_res1; /* reserved */
- u_char esis_type; /* type code */
- /* technically, type should be &='d 0x1f */
-#define ESIS_ESH 0x02 /* End System Hello */
-#define ESIS_ISH 0x04 /* Intermediate System Hello */
-#define ESIS_RD 0x06 /* Redirect */
- u_char esis_ht_msb; /* holding time (seconds) high byte */
- u_char esis_ht_lsb; /* holding time (seconds) low byte */
- u_char esis_cksum_msb; /* checksum high byte */
- u_char esis_cksum_lsb; /* checksum low byte */
-} __attribute__((packed));
-/*
- * Values for ESIS datagram options
- */
-#define ESISOVAL_NETMASK 0xe1 /* address mask option, RD PDU only */
-#define ESISOVAL_SNPAMASK 0xe2 /* snpa mask option, RD PDU only */
-#define ESISOVAL_ESCT 0xc6 /* end system conf. timer, ISH PDU
- * only */
-
-
-#define ESIS_CKSUM_OFF 0x07
-#define ESIS_CKSUM_REQUIRED(pdu)\
- ((pdu->esis_cksum_msb != 0) || (pdu->esis_cksum_lsb != 0))
-
-#define ESIS_VERSION 1
-
-struct esis_stat {
- u_short es_nomem; /* insufficient memory to send hello */
- u_short es_badcsum; /* incorrect checksum */
- u_short es_badvers; /* incorrect version number */
- u_short es_badtype; /* unknown pdu type field */
- u_short es_toosmall; /* packet too small */
- u_short es_eshsent; /* ESH sent */
- u_short es_eshrcvd; /* ESH rcvd */
- u_short es_ishsent; /* ISH sent */
- u_short es_ishrcvd; /* ISH rcvd */
- u_short es_rdsent; /* RD sent */
- u_short es_rdrcvd; /* RD rcvd */
-};
-
-#ifdef _KERNEL
-struct esis_stat esis_stat;
-struct socket;
-struct mbuf;
-struct snpa_hdr;
-struct clnp_optidx;
-struct iso_addr;
-struct rtentry;
-struct sockaddr_dl;
-
-void esis_init __P((void));
-int esis_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *,
- struct mbuf *, struct proc *));
-void esis_input __P((struct mbuf *, ...));
-void esis_rdoutput __P((struct snpa_hdr *, struct mbuf *, struct clnp_optidx *,
- struct iso_addr *, struct rtentry *));
-int esis_insert_addr __P((caddr_t *, int *, struct iso_addr *, struct mbuf *,
- int));
-void esis_eshinput __P((struct mbuf *, struct snpa_hdr *));
-void esis_ishinput __P((struct mbuf *, struct snpa_hdr *));
-void esis_rdinput __P((struct mbuf *, struct snpa_hdr *));
-void esis_config __P((void *));
-void esis_shoutput __P((struct ifnet *, int, int, caddr_t, int,
- struct iso_addr *));
-void isis_input __P((struct mbuf *, ...));
-int isis_output __P((struct mbuf *, ...));
-void *esis_ctlinput __P((int, struct sockaddr *, void *));
-#endif /* _KERNEL */
diff --git a/isisd/include-netbsd/iso.h b/isisd/include-netbsd/iso.h deleted file mode 100644 index 42b9bc88de..0000000000 --- a/isisd/include-netbsd/iso.h +++ /dev/null @@ -1,214 +0,0 @@ -/* $NetBSD: iso.h,v 1.13 2000/07/28 12:13:34 kleink Exp $ */ - -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)iso.h 8.1 (Berkeley) 6/10/93 - */ - -/*********************************************************** - Copyright IBM Corporation 1987 - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of IBM not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -******************************************************************/ - -/* - * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison - */ - -#ifndef _NETISO_ISO_H_ -#define _NETISO_ISO_H_ - -#if 0 -#include <sys/ansi.h> -#endif - -#if 0 -#ifndef sa_family_t -typedef __sa_family_t sa_family_t; -#define sa_family_t __sa_family_t -#endif -#endif -/* - * Return true if this is a multicast address - * This assumes that the bit transmission is lsb first. This - * assumption is valid for 802.3 but not 802.5. There is a - * kludge to get around this for 802.5 -- see if_lan.c - * where subnetwork header is setup. - */ -#define IS_MULTICAST(snpa)\ - ((snpa)[0] & 0x01) - -/* - * Protocols - */ -#define ISOPROTO_TCP 6 /* IETF experiment */ -#define ISOPROTO_UDP 17 /* IETF experiment */ -#define ISOPROTO_TP0 25 /* connection oriented transport protocol */ -#define ISOPROTO_TP1 26 /* not implemented */ -#define ISOPROTO_TP2 27 /* not implemented */ -#define ISOPROTO_TP3 28 /* not implemented */ -#define ISOPROTO_TP4 29 /* connection oriented transport protocol */ -#define ISOPROTO_TP ISOPROTO_TP4 /* tp-4 with negotiation */ -#define ISOPROTO_CLTP 30 /* connectionless transport (not yet impl.) */ -#define ISOPROTO_CLNP 31 /* connectionless internetworking protocol */ -#define ISOPROTO_X25 32 /* cons */ -#define ISOPROTO_INACT_NL 33 /* inactive network layer! */ -#define ISOPROTO_ESIS 34 /* ES-IS protocol */ -#define ISOPROTO_INTRAISIS 35 /* IS-IS protocol */ -#define ISOPROTO_IDRP 36 /* Interdomain Routing Protocol */ - -#define ISOPROTO_RAW 255 /* raw clnp */ -#define ISOPROTO_MAX 256 - -#define ISO_PORT_RESERVED 1024 -#define ISO_PORT_USERRESERVED 5000 -/* - * Port/socket numbers: standard network functions - * NOT PRESENTLY USED - */ -#define ISO_PORT_MAINT 501 -#define ISO_PORT_ECHO 507 -#define ISO_PORT_DISCARD 509 -#define ISO_PORT_SYSTAT 511 -#define ISO_PORT_NETSTAT 515 -/* - * Port/socket numbers: non-standard application functions - */ -#define ISO_PORT_LOGIN 513 -/* - * Port/socket numbers: public use - */ -#define ISO_PORT_PUBLIC 1024 /* high bit set --> public */ - -/* - * Network layer protocol identifiers - */ -#define ISO8473_CLNP 0x81 -#define ISO9542_ESIS 0x82 -#define ISO9542X25_ESIS 0x8a -#define ISO10589_ISIS 0x83 -#define ISO8878A_CONS 0x84 -#define ISO10747_IDRP 0x85 - - -#ifndef IN_CLASSA_NET -#include <netinet/in.h> -#endif /* IN_CLASSA_NET */ - - - -/* - * The following looks like a sockaddr to facilitate using tree lookup - * routines - */ -struct iso_addr { - u_char isoa_len; /* length (in bytes) */ - char isoa_genaddr[20]; /* general opaque address */ -}; - -struct sockaddr_iso { - u_char siso_len; /* length */ - sa_family_t siso_family; /* family */ - u_char siso_plen; /* presentation selector length */ - u_char siso_slen; /* session selector length */ - u_char siso_tlen; /* transport selector length */ - struct iso_addr siso_addr; /* network address */ - u_char siso_pad[6]; /* space for gosip v2 sels */ - /* makes struct 32 bytes long */ -}; -#define siso_nlen siso_addr.isoa_len -#define siso_data siso_addr.isoa_genaddr - -#define TSEL(s) ((caddr_t)((s)->siso_data + (s)->siso_nlen)) - -#define SAME_ISOADDR(a, b) \ - (bcmp((a)->siso_data, (b)->siso_data, (unsigned)(a)->siso_nlen)==0) -#define SAME_ISOIFADDR(a, b) (bcmp((a)->siso_data, (b)->siso_data, \ - (unsigned)((b)->siso_nlen - (b)->siso_tlen)) == 0) -/* - * The following are specific values for siso->siso_data[0], - * otherwise known as the AFI: - */ -#define AFI_37 0x37 /* bcd of "37" */ -#define AFI_OSINET 0x47 /* bcd of "47" */ -#define AFI_RFC986 0x47 /* bcd of "47" */ -#define AFI_SNA 0x00 /* SubNetwork Address; invalid really... */ - -#ifdef _KERNEL - -extern struct domain isodomain; -extern struct protosw isosw[]; - -#define satosiso(sa) ((struct sockaddr_iso *)(sa)) -#define sisotosa(siso) ((struct sockaddr *)(siso)) - -#else -/* user utilities definitions from the iso library */ - -#ifndef HAVE_SYS_CDEFS_H -#define __P(x) x -#define __BEGIN_DECLS -#define __END_DECLS -#else -#include <sys/cdefs.h> -#endif - -__BEGIN_DECLS -struct iso_addr *iso_addr __P((const char *)); -char *iso_ntoa __P((const struct iso_addr *)); - -/* THESE DON'T EXIST YET */ -struct hostent *iso_gethostbyname __P((const char *)); -struct hostent *iso_gethostbyaddr __P((const char *, int, int)); -__END_DECLS - -#endif /* _KERNEL */ - -#endif /* _NETISO_ISO_H_ */ diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c index 8afabede4e..7f8e8deccc 100644 --- a/isisd/isis_adjacency.c +++ b/isisd/isis_adjacency.c @@ -33,7 +33,6 @@ #include "stream.h" #include "isisd/dict.h" -#include "isisd/include-netbsd/iso.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" #include "isisd/isis_flags.h" diff --git a/isisd/isis_bpf.c b/isisd/isis_bpf.c index 889b4c3099..8775e12a24 100644 --- a/isisd/isis_bpf.c +++ b/isisd/isis_bpf.c @@ -34,7 +34,6 @@ #include "if.h" #include "isisd/dict.h" -#include "isisd/include-netbsd/iso.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" #include "isisd/isis_circuit.h" diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index c2b7ec7507..c5812a658d 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -44,7 +44,6 @@ #include "qobj.h" #include "isisd/dict.h" -#include "isisd/include-netbsd/iso.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" #include "isisd/isis_flags.h" @@ -720,8 +719,8 @@ isis_circuit_up (struct isis_circuit *circuit) THREAD_READ_ON (master, circuit->t_read, isis_receive, circuit, circuit->fd); #else - THREAD_TIMER_ON (master, circuit->t_read, isis_receive, circuit, - circuit->fd); + THREAD_TIMER_MSEC_ON (master, circuit->t_read, isis_receive, circuit, + listcount (circuit->area->circuit_list) * 100); #endif circuit->lsp_queue = list_new (); diff --git a/isisd/isis_constants.h b/isisd/isis_constants.h index 8b21894e43..17616d671b 100644 --- a/isisd/isis_constants.h +++ b/isisd/isis_constants.h @@ -35,6 +35,9 @@ #define INTRADOMAIN_ROUTEING_SELECTOR 0 #define SEQUENCE_MODULUS 4294967296 +#define ISO9542_ESIS 0x82 +#define ISO10589_ISIS 0x83 + /* * implementation specific jitter values */ diff --git a/isisd/isis_csm.c b/isisd/isis_csm.c index 0f642a7778..0fbf47aea1 100644 --- a/isisd/isis_csm.c +++ b/isisd/isis_csm.c @@ -33,7 +33,6 @@ #include "stream.h" #include "isisd/dict.h" -#include "isisd/include-netbsd/iso.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" #include "isisd/isis_flags.h" diff --git a/isisd/isis_dlpi.c b/isisd/isis_dlpi.c index 7c7e0909e9..98b18ac38d 100644 --- a/isisd/isis_dlpi.c +++ b/isisd/isis_dlpi.c @@ -38,7 +38,6 @@ #include "if.h" #include "isisd/dict.h" -#include "isisd/include-netbsd/iso.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" #include "isisd/isis_circuit.h" diff --git a/isisd/isis_events.c b/isisd/isis_events.c index abc4471cad..ab42a1e367 100644 --- a/isisd/isis_events.c +++ b/isisd/isis_events.c @@ -33,7 +33,6 @@ #include "table.h" #include "isisd/dict.h" -#include "isisd/include-netbsd/iso.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" #include "isisd/isis_flags.h" diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c index 55887f901d..dedf2a71dd 100644 --- a/isisd/isis_lsp.c +++ b/isisd/isis_lsp.c @@ -54,10 +54,6 @@ #include "isisd/isis_spf.h" #include "isisd/isis_te.h" -#ifdef TOPOLOGY_GENERATE -#include "spgrid.h" -#endif - /* staticly assigned vars for printing purposes */ char lsp_bits_string[200]; /* FIXME: enough ? */ @@ -1483,29 +1479,6 @@ lsp_build (struct isis_lsp *lsp, struct isis_area *area) memset (&tlv_data, 0, sizeof (struct tlvs)); -#ifdef TOPOLOGY_GENERATE - /* If topology exists (and we create topology for level 1 only), create - * (hardcoded) link to topology. */ - if (area->topology && level == IS_LEVEL_1) - { - if (tlv_data.is_neighs == NULL) - { - tlv_data.is_neighs = list_new (); - tlv_data.is_neighs->del = free_tlv; - } - is_neigh = XCALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh)); - - memcpy (&is_neigh->neigh_id, area->topology_baseis, ISIS_SYS_ID_LEN); - is_neigh->neigh_id[ISIS_SYS_ID_LEN - 1] = (1 & 0xFF); - is_neigh->neigh_id[ISIS_SYS_ID_LEN - 2] = ((1 >> 8) & 0xFF); - is_neigh->metrics.metric_default = 0x01; - is_neigh->metrics.metric_delay = METRICS_UNSUPPORTED; - is_neigh->metrics.metric_expense = METRICS_UNSUPPORTED; - is_neigh->metrics.metric_error = METRICS_UNSUPPORTED; - listnode_add (tlv_data.is_neighs, is_neigh); - } -#endif /* TOPOLOGY_GENERATE */ - lsp_debug("ISIS (%s): Adding circuit specific information.", area->area_tag); /* @@ -2663,10 +2636,6 @@ lsp_tick (struct thread *thread) lsp->level, rawlspid_print (lsp->lsp_header->lsp_id), ntohl (lsp->lsp_header->seq_num)); -#ifdef TOPOLOGY_GENERATE - if (lsp->from_topology) - THREAD_TIMER_OFF (lsp->t_lsp_top_ref); -#endif /* TOPOLOGY_GENERATE */ lsp_destroy (lsp); lsp = NULL; dict_delete_free (area->lspdb[level], dnode); @@ -2828,246 +2797,3 @@ void lsp_set_all_srmflags (struct isis_lsp *lsp) } } } - -#ifdef TOPOLOGY_GENERATE -static int -top_lsp_refresh (struct thread *thread) -{ - struct isis_lsp *lsp; - u_int16_t rem_lifetime; - - lsp = THREAD_ARG (thread); - assert (lsp); - - lsp->t_lsp_top_ref = NULL; - - lsp_seqnum_update (lsp); - - lsp_set_all_srmflags (lsp); - if (isis->debugs & DEBUG_UPDATE_PACKETS) - { - zlog_debug ("ISIS-Upd (): refreshing Topology L1 %s", - rawlspid_print (lsp->lsp_header->lsp_id)); - } - /* Refresh dynamic hostname in the cache. */ - isis_dynhn_insert (lsp->lsp_header->lsp_id, lsp->tlv_data.hostname, - IS_LEVEL_1); - - lsp->lsp_header->lsp_bits = lsp_bits_generate (lsp->level, - lsp->area->overload_bit, - lsp->area->attached_bit); - rem_lifetime = lsp_rem_lifetime (lsp->area, IS_LEVEL_1); - lsp->lsp_header->rem_lifetime = htons (rem_lifetime); - - /* refresh_time = lsp_refresh_time (lsp, rem_lifetime); */ - THREAD_TIMER_ON (master, lsp->t_lsp_top_ref, top_lsp_refresh, lsp, - lsp->area->lsp_refresh[0]); - - return ISIS_OK; -} - -void -generate_topology_lsps (struct isis_area *area) -{ - struct listnode *node; - int i, max = 0; - struct arc *arc; - u_char lspid[ISIS_SYS_ID_LEN + 2]; - struct isis_lsp *lsp; - u_int16_t rem_lifetime, refresh_time; - - /* first we find the maximal node */ - for (ALL_LIST_ELEMENTS_RO (area->topology, node, arc)) - { - if (arc->from_node > max) - max = arc->from_node; - if (arc->to_node > max) - max = arc->to_node; - } - - for (i = 1; i < (max + 1); i++) - { - memcpy (lspid, area->topology_baseis, ISIS_SYS_ID_LEN); - LSP_PSEUDO_ID (lspid) = 0x00; - LSP_FRAGMENT (lspid) = 0x00; - lspid[ISIS_SYS_ID_LEN - 1] = (i & 0xFF); - lspid[ISIS_SYS_ID_LEN - 2] = ((i >> 8) & 0xFF); - - rem_lifetime = lsp_rem_lifetime (area, IS_LEVEL_1); - lsp = lsp_new (area, lspid, rem_lifetime, 1, - IS_LEVEL_1 | area->overload_bit | area->attached_bit, - 0, 1); - if (!lsp) - return; - lsp->from_topology = 1; - - /* Creating LSP data based on topology info. */ - build_topology_lsp_data (lsp, area, i); - /* Checksum is also calculated here. */ - lsp_seqnum_update (lsp); - /* Take care of inserting dynamic hostname into cache. */ - isis_dynhn_insert (lspid, lsp->tlv_data.hostname, IS_LEVEL_1); - - refresh_time = lsp_refresh_time (lsp, rem_lifetime); - THREAD_TIMER_ON (master, lsp->t_lsp_top_ref, top_lsp_refresh, lsp, - refresh_time); - lsp_set_all_srmflags (lsp); - lsp_insert (lsp, area->lspdb[0]); - } -} - -void -remove_topology_lsps (struct isis_area *area) -{ - struct isis_lsp *lsp; - dnode_t *dnode, *dnode_next; - - dnode = dict_first (area->lspdb[0]); - while (dnode != NULL) - { - dnode_next = dict_next (area->lspdb[0], dnode); - lsp = dnode_get (dnode); - if (lsp->from_topology) - { - THREAD_TIMER_OFF (lsp->t_lsp_top_ref); - lsp_destroy (lsp); - dict_delete (area->lspdb[0], dnode); - } - dnode = dnode_next; - } -} - -void -build_topology_lsp_data (struct isis_lsp *lsp, struct isis_area *area, - int lsp_top_num) -{ - struct listnode *node; - struct arc *arc; - struct is_neigh *is_neigh; - struct te_is_neigh *te_is_neigh; - char buff[200]; - struct tlvs tlv_data; - struct isis_lsp *lsp0 = lsp; - - /* Add area addresses. FIXME: Is it needed at all? */ - if (lsp->tlv_data.area_addrs == NULL) - lsp->tlv_data.area_addrs = list_new (); - list_add_list (lsp->tlv_data.area_addrs, area->area_addrs); - - if (lsp->tlv_data.nlpids == NULL) - lsp->tlv_data.nlpids = XMALLOC (MTYPE_ISIS_TLV, sizeof (struct nlpids)); - lsp->tlv_data.nlpids->count = 1; - lsp->tlv_data.nlpids->nlpids[0] = NLPID_IP; - - if (area->dynhostname) - { - lsp->tlv_data.hostname = XMALLOC (MTYPE_ISIS_TLV, - sizeof (struct hostname)); - memset (buff, 0x00, 200); - sprintf (buff, "%s%d", area->topology_basedynh ? area->topology_basedynh : - "feedme", lsp_top_num); - memcpy (lsp->tlv_data.hostname->name, buff, strlen (buff)); - lsp->tlv_data.hostname->namelen = strlen (buff); - } - - if (lsp->tlv_data.nlpids) - tlv_add_nlpid (lsp->tlv_data.nlpids, lsp->pdu); - if (lsp->tlv_data.hostname) - tlv_add_dynamic_hostname (lsp->tlv_data.hostname, lsp->pdu); - if (lsp->tlv_data.area_addrs && listcount (lsp->tlv_data.area_addrs) > 0) - tlv_add_area_addrs (lsp->tlv_data.area_addrs, lsp->pdu); - - memset (&tlv_data, 0, sizeof (struct tlvs)); - if (tlv_data.is_neighs == NULL) - { - tlv_data.is_neighs = list_new (); - tlv_data.is_neighs->del = free_tlv; - } - - /* Add reachability for this IS for simulated 1. */ - if (lsp_top_num == 1) - { - is_neigh = XCALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh)); - - memcpy (&is_neigh->neigh_id, isis->sysid, ISIS_SYS_ID_LEN); - LSP_PSEUDO_ID (is_neigh->neigh_id) = 0x00; - /* Metric MUST NOT be 0, unless it's not alias TLV. */ - is_neigh->metrics.metric_default = 0x01; - is_neigh->metrics.metric_delay = METRICS_UNSUPPORTED; - is_neigh->metrics.metric_expense = METRICS_UNSUPPORTED; - is_neigh->metrics.metric_error = METRICS_UNSUPPORTED; - listnode_add (tlv_data.is_neighs, is_neigh); - } - - /* Add IS reachabilities. */ - for (ALL_LIST_ELEMENTS_RO (area->topology, node, arc)) - { - int to_lsp = 0; - - if ((lsp_top_num != arc->from_node) && (lsp_top_num != arc->to_node)) - continue; - - if (lsp_top_num == arc->from_node) - to_lsp = arc->to_node; - else - to_lsp = arc->from_node; - - if (area->oldmetric) - { - is_neigh = XCALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh)); - - memcpy (&is_neigh->neigh_id, area->topology_baseis, ISIS_SYS_ID_LEN); - is_neigh->neigh_id[ISIS_SYS_ID_LEN - 1] = (to_lsp & 0xFF); - is_neigh->neigh_id[ISIS_SYS_ID_LEN - 2] = ((to_lsp >> 8) & 0xFF); - is_neigh->metrics.metric_default = arc->distance; - is_neigh->metrics.metric_delay = METRICS_UNSUPPORTED; - is_neigh->metrics.metric_expense = METRICS_UNSUPPORTED; - is_neigh->metrics.metric_error = METRICS_UNSUPPORTED; - listnode_add (tlv_data.is_neighs, is_neigh); - } - - if (area->newmetric) - { - if (tlv_data.te_is_neighs == NULL) - { - tlv_data.te_is_neighs = list_new (); - tlv_data.te_is_neighs->del = free_tlv; - } - te_is_neigh = XCALLOC (MTYPE_ISIS_TLV, sizeof (struct te_is_neigh)); - memcpy (&te_is_neigh->neigh_id, area->topology_baseis, - ISIS_SYS_ID_LEN); - te_is_neigh->neigh_id[ISIS_SYS_ID_LEN - 1] = (to_lsp & 0xFF); - te_is_neigh->neigh_id[ISIS_SYS_ID_LEN - 2] = ((to_lsp >> 8) & 0xFF); - SET_TE_METRIC(te_is_neigh, arc->distance); - listnode_add (tlv_data.te_is_neighs, te_is_neigh); - } - } - - while (tlv_data.is_neighs && listcount (tlv_data.is_neighs)) - { - if (lsp->tlv_data.is_neighs == NULL) - lsp->tlv_data.is_neighs = list_new (); - lsp_tlv_fit (lsp, &tlv_data.is_neighs, &lsp->tlv_data.is_neighs, - IS_NEIGHBOURS_LEN, area->lsp_frag_threshold, - tlv_add_is_neighs); - if (tlv_data.is_neighs && listcount (tlv_data.is_neighs)) - lsp = lsp_next_frag (LSP_FRAGMENT (lsp->lsp_header->lsp_id) + 1, - lsp0, area, IS_LEVEL_1); - } - - while (tlv_data.te_is_neighs && listcount (tlv_data.te_is_neighs)) - { - if (lsp->tlv_data.te_is_neighs == NULL) - lsp->tlv_data.te_is_neighs = list_new (); - lsp_tlv_fit (lsp, &tlv_data.te_is_neighs, &lsp->tlv_data.te_is_neighs, - IS_NEIGHBOURS_LEN, area->lsp_frag_threshold, - tlv_add_te_is_neighs); - if (tlv_data.te_is_neighs && listcount (tlv_data.te_is_neighs)) - lsp = lsp_next_frag (LSP_FRAGMENT (lsp->lsp_header->lsp_id) + 1, - lsp0, area, IS_LEVEL_1); - } - - free_tlvs (&tlv_data); - return; -} -#endif /* TOPOLOGY_GENERATE */ diff --git a/isisd/isis_lsp.h b/isisd/isis_lsp.h index 7b2286b189..24fae57a7b 100644 --- a/isisd/isis_lsp.h +++ b/isisd/isis_lsp.h @@ -46,10 +46,6 @@ struct isis_lsp time_t installed; time_t last_generated; int own_lsp; -#ifdef TOPOLOGY_GENERATE - int from_topology; - struct thread *t_lsp_top_ref; -#endif /* used for 60 second counting when rem_lifetime is zero */ int age_out; struct isis_area *area; @@ -118,11 +114,4 @@ void lsp_te_tlv_fit (struct isis_lsp *lsp, struct list **from, /* sets SRMflags for all active circuits of an lsp */ void lsp_set_all_srmflags (struct isis_lsp *lsp); -#ifdef TOPOLOGY_GENERATE -void generate_topology_lsps (struct isis_area *area); -void remove_topology_lsps (struct isis_area *area); -void build_topology_lsp_data (struct isis_lsp *lsp, - struct isis_area *area, int lsp_top_num); -#endif /* TOPOLOGY_GENERATE */ - #endif /* ISIS_LSP */ diff --git a/isisd/isis_main.c b/isisd/isis_main.c index 44c7840022..84ebf8ceaa 100644 --- a/isisd/isis_main.c +++ b/isisd/isis_main.c @@ -41,7 +41,6 @@ #include "qobj.h" #include "isisd/dict.h" -#include "include-netbsd/iso.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" #include "isisd/isis_flags.h" diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c index 1dfb4623f6..6fec498a4d 100644 --- a/isisd/isis_pdu.c +++ b/isisd/isis_pdu.c @@ -36,7 +36,6 @@ #include "md5.h" #include "isisd/dict.h" -#include "isisd/include-netbsd/iso.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" #include "isisd/isis_flags.h" @@ -1443,11 +1442,7 @@ process_lsp (int level, struct isis_circuit *circuit, const u_char *ssnpa) if (lsp) comp = lsp_compare (circuit->area->area_tag, lsp, hdr->seq_num, hdr->checksum, hdr->rem_lifetime); - if (lsp && (lsp->own_lsp -#ifdef TOPOLOGY_GENERATE - || lsp->from_topology -#endif /* TOPOLOGY_GENERATE */ - )) + if (lsp && (lsp->own_lsp)) goto dontcheckadj; /* 7.3.15.1 a) 6 - Must check that we have an adjacency of the same level */ diff --git a/isisd/isis_pfpacket.c b/isisd/isis_pfpacket.c index 2427047b38..6ec7771ec2 100644 --- a/isisd/isis_pfpacket.c +++ b/isisd/isis_pfpacket.c @@ -25,13 +25,14 @@ #include <net/ethernet.h> /* the L2 protocols */ #include <netpacket/packet.h> +#include <linux/filter.h> + #include "log.h" #include "network.h" #include "stream.h" #include "if.h" #include "isisd/dict.h" -#include "isisd/include-netbsd/iso.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" #include "isisd/isis_circuit.h" @@ -45,6 +46,25 @@ extern struct zebra_privs_t isisd_privs; +/* tcpdump -i eth0 'isis' -dd */ +static struct sock_filter isisfilter[] = { +/* NB: we're in SOCK_DGRAM, so src/dst mac + length are stripped off! + * (OTOH it's a bit more lower-layer agnostic and might work over GRE?) */ +/* { 0x28, 0, 0, 0x0000000c - 14 }, */ +/* { 0x25, 5, 0, 0x000005dc }, */ + { 0x28, 0, 0, 0x0000000e - 14 }, + { 0x15, 0, 3, 0x0000fefe }, + { 0x30, 0, 0, 0x00000011 - 14 }, + { 0x15, 0, 1, 0x00000083 }, + { 0x6, 0, 0, 0x00040000 }, + { 0x6, 0, 0, 0x00000000 }, +}; + +static struct sock_fprog bpf = { + .len = array_size(isisfilter), + .filter = isisfilter, +}; + /* * Table 9 - Architectural constants for use with ISO 8802 subnetworks * ISO 10589 - 8.4.8 @@ -118,6 +138,12 @@ open_packet_socket (struct isis_circuit *circuit) return ISIS_WARNING; } + if (setsockopt (fd, SOL_SOCKET, SO_ATTACH_FILTER, &bpf, sizeof (bpf))) + { + zlog_warn ("open_packet_socket(): SO_ATTACH_FILTER failed: %s", + safe_strerror (errno)); + } + /* * Bind to the physical interface */ diff --git a/isisd/isisd.c b/isisd/isisd.c index c3bc33eb22..cce0c1e391 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -37,7 +37,6 @@ #include "qobj.h" #include "isisd/dict.h" -#include "isisd/include-netbsd/iso.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" #include "isisd/isis_flags.h" @@ -57,11 +56,6 @@ #include "isisd/isis_events.h" #include "isisd/isis_te.h" -#ifdef TOPOLOGY_GENERATE -#include "spgrid.h" -u_char DEFAULT_TOPOLOGY_BASEIS[6] = { 0xFE, 0xED, 0xFE, 0xED, 0x00, 0x00 }; -#endif /* TOPOLOGY_GENERATE */ - struct isis *isis = NULL; DEFINE_QOBJ_TYPE(isis) @@ -166,9 +160,6 @@ isis_area_create (const char *area_tag) area->newmetric = 1; area->lsp_frag_threshold = 90; area->lsp_mtu = DEFAULT_LSP_MTU; -#ifdef TOPOLOGY_GENERATE - memcpy (area->topology_baseis, DEFAULT_TOPOLOGY_BASEIS, ISIS_SYS_ID_LEN); -#endif /* TOPOLOGY_GENERATE */ area->area_tag = strdup (area_tag); listnode_add (isis->area_list, area); @@ -1916,119 +1907,6 @@ DEFUN (no_log_adj_changes, return CMD_SUCCESS; } -#ifdef TOPOLOGY_GENERATE - -DEFUN (topology_generate_grid, - topology_generate_grid_cmd, - "topology generate grid (1-100) (1-100) (1-65000) [param] [param] [param]", - "Topology generation for IS-IS\n" - "Topology generation\n" - "Grid topology\n" - "X parameter of the grid\n" - "Y parameter of the grid\n" - "Random seed\n" - "Optional param 1\n" - "Optional param 2\n" - "Optional param 3\n" - "Topology\n") -{ - VTY_DECLVAR_CONTEXT (isis_area, area); - - if (!spgrid_check_params (vty, argc, argv)) - { - if (area->topology) - list_delete (area->topology); - area->topology = list_new (); - memcpy (area->top_params, vty->buf, 200); - gen_spgrid_topology (vty, area->topology); - remove_topology_lsps (area); - generate_topology_lsps (area); - /* Regenerate L1 LSP to get two way connection to the generated - * topology. */ - lsp_regenerate_schedule (area, IS_LEVEL_1 | IS_LEVEL_2, 1); - } - - return CMD_SUCCESS; -} - -DEFUN (show_isis_generated_topology, - show_isis_generated_topology_cmd, - "show isis generated-topologies", - SHOW_STR - "ISIS network information\n" - "Show generated topologies\n") -{ - struct isis_area *area; - struct listnode *node; - struct listnode *node2; - struct arc *arc; - - for (ALL_LIST_ELEMENTS_RO (isis->area_list, node, area)) - { - if (!area->topology) - continue; - - vty_out (vty, "Topology for isis area: %s%s", area->area_tag, - VTY_NEWLINE); - vty_out (vty, "From node To node Distance%s", VTY_NEWLINE); - - for (ALL_LIST_ELEMENTS_RO (area->topology, node2, arc)) - vty_out (vty, "%9ld %11ld %12ld%s", arc->from_node, arc->to_node, - arc->distance, VTY_NEWLINE); - } - return CMD_SUCCESS; -} - -/* Base IS for topology generation. */ -DEFUN (topology_baseis, - topology_baseis_cmd, - "topology base-is WORD", - "Topology generation for IS-IS\n" - "A Network IS Base for this topology\n" - "XXXX.XXXX.XXXX Network entity title (NET)\n") -{ - int idx_word = 2; - u_char buff[ISIS_SYS_ID_LEN]; - VTY_DECLVAR_CONTEXT (isis_area, area); - - if (sysid2buff (buff, argv[idx_word]->arg)) - sysid2buff (area->topology_baseis, argv[idx_word]->arg); - - return CMD_SUCCESS; -} - -DEFUN (no_topology_baseis, - no_topology_baseis_cmd, - "no topology base-is [WORD]", - NO_STR - "Topology generation for IS-IS\n" - "A Network IS Base for this topology\n" - "XXXX.XXXX.XXXX Network entity title (NET)\n") -{ - VTY_DECLVAR_CONTEXT (isis_area, area); - - memcpy (area->topology_baseis, DEFAULT_TOPOLOGY_BASEIS, ISIS_SYS_ID_LEN); - return CMD_SUCCESS; -} - - -DEFUN (topology_basedynh, - topology_basedynh_cmd, - "topology base-dynh WORD", - "Topology generation for IS-IS\n" - "Dynamic hostname base for this topology\n" - "Dynamic hostname base\n") -{ - int idx_word = 2; - VTY_DECLVAR_CONTEXT (isis_area, area); - - /* I hope that it's enough. */ - area->topology_basedynh = strndup (argv[idx_word]->arg, 16); - return CMD_SUCCESS; -} - -#endif /* TOPOLOGY_GENERATE */ - /* IS-IS configuration write function */ int isis_config_write (struct vty *vty) @@ -2270,28 +2148,6 @@ isis_config_write (struct vty *vty) write++; } -#ifdef TOPOLOGY_GENERATE - if (memcmp (area->topology_baseis, DEFAULT_TOPOLOGY_BASEIS, - ISIS_SYS_ID_LEN)) - { - vty_out (vty, " topology base-is %s%s", - sysid_print ((u_char *)area->topology_baseis), VTY_NEWLINE); - write++; - } - if (area->topology_basedynh) - { - vty_out (vty, " topology base-dynh %s%s", - area->topology_basedynh, VTY_NEWLINE); - write++; - } - /* We save the whole command line here. */ - if (strlen(area->top_params)) - { - vty_out (vty, " %s%s", area->top_params, VTY_NEWLINE); - write++; - } -#endif /* TOPOLOGY_GENERATE */ - } isis_mpls_te_config_write_router(vty); } @@ -2402,12 +2258,4 @@ isis_init () install_element (ISIS_NODE, &log_adj_changes_cmd); install_element (ISIS_NODE, &no_log_adj_changes_cmd); - -#ifdef TOPOLOGY_GENERATE - install_element (ISIS_NODE, &topology_generate_grid_cmd); - install_element (ISIS_NODE, &topology_baseis_cmd); - install_element (ISIS_NODE, &topology_basedynh_cmd); - install_element (ISIS_NODE, &no_topology_baseis_cmd); - install_element (VIEW_NODE, &show_isis_generated_topology_cmd); -#endif /* TOPOLOGY_GENERATE */ } diff --git a/isisd/isisd.h b/isisd/isisd.h index 2c303d9304..f7dc0efe25 100644 --- a/isisd/isisd.h +++ b/isisd/isisd.h @@ -133,13 +133,6 @@ struct isis_area [ZEBRA_ROUTE_MAX + 1][ISIS_LEVELS]; struct route_table *ext_reach[REDIST_PROTOCOL_COUNT][ISIS_LEVELS]; -#ifdef TOPOLOGY_GENERATE - struct list *topology; - u_char topology_baseis[ISIS_SYS_ID_LEN]; /* IS for the first IS emulated. */ - char *topology_basedynh; /* Dynamic hostname base. */ - char top_params[200]; /* FIXME: what is reasonable? */ -#endif /* TOPOLOGY_GENERATE */ - QOBJ_FIELDS }; DECLARE_QOBJ_TYPE(isis_area) diff --git a/isisd/topology/.gitignore b/isisd/topology/.gitignore deleted file mode 100644 index dd75c27fb8..0000000000 --- a/isisd/topology/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -Makefile -Makefile.in -*.o -tags -TAGS -.deps -.nfs* -.arch-inventory -.arch-ids -*~ -*.loT - diff --git a/isisd/topology/Makefile.am b/isisd/topology/Makefile.am deleted file mode 100644 index fe73ae5c68..0000000000 --- a/isisd/topology/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## Process this file with automake to produce Makefile.in. - -AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib -DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" - -AM_CFLAGS = $(PICFLAGS) -AM_LDFLAGS = $(PILDFLAGS) - -noinst_LIBRARIES = libtopology.a - -libtopology_a_SOURCES = \ - spgrid.c random.c - -libtopology_a_DEPENDENCIES = @LIB_REGEX@ - -libtopology_a_LIBADD = @LIB_REGEX@ ../../lib/libzebra.la - -noinst_HEADERS = \ - spgrid.h - -## File dependency. diff --git a/isisd/topology/random.c b/isisd/topology/random.c deleted file mode 100644 index be85f7ca18..0000000000 --- a/isisd/topology/random.c +++ /dev/null @@ -1,166 +0,0 @@ -/*********************************************************************/ -/* */ -/* current processor time in seconds */ -/* difference between two calls is processor time spent by your code */ -/* needs: <sys/types.h>, <sys/times.h> */ -/* depends on compiler and OS */ -/* */ -/*********************************************************************/ - -#include <zebra.h> -#include <sys/types.h> -#include <sys/times.h> - -/* - * Prototypes. - */ -unsigned long timer(void); -void init_rand(long); -double rand01(void); -double randg01(void); -long nrand(long); -void free_arc(void *); - -unsigned long timer (void) - { struct tms hold; - - times(&hold); - return (unsigned long) ((float) (hold.tms_utime) / 60.0); - } - - -/*********************************************************************/ -/* */ -/* Family of random number generators */ -/* */ -/* Initialisation: */ -/* void init_rand ( seed ); */ -/* long seed - any positive number */ -/* if seed<=0 init_rand takes time */ -/* from timer instead of seed */ -/* */ -/* Whole number uniformly distributed on [0,n): */ -/* long nrand (n); */ -/* long n */ -/* */ -/* Real number uniformly distributed on [0,1] */ -/* double rand01(); */ -/* */ -/* Real number with Gauss(0,1) disitribution: */ -/* double randg01(); */ -/* */ -/* Algorithm: */ -/* x(n+1) = (x(n) * 5^13) mod 2^31 */ -/* */ -/*********************************************************************/ - -unsigned long internal_seed; - -void init_rand ( init_seed ) - -long init_seed; - -{ internal_seed = ( init_seed > 0 ) - ? (unsigned long) init_seed - : (unsigned long) timer(); - - - /* only odd numbers are acceptable */ - if ( internal_seed % 2 == 0 ) internal_seed --; -} - -/*********************************************************************/ -/* */ -/* Internal function irand may depend on OS and compiler */ -/* */ -/* irand assumption: */ -/* unsigned long i,j; */ -/* if i*j > max(unsigned long) */ -/* 1. No overflow interruption */ -/* 2. i*j = i*j mod max(unsigned long) */ -/* */ -/* This assumption is true for a lot of computers. */ -/* If your computer fails: */ -/* rename: irand <---> xrand */ -/* */ -/*********************************************************************/ - -#define A 1220703125 -#define B 2147483647 -#define BF 2147483647. - -static long irand (void) - -{ internal_seed = ( internal_seed * A ) & B; - return (long) internal_seed ; -} - -#if 0 /* Not used. */ -/*********************************************************************/ -/* */ -/* computer independent variant of irand */ -/* */ -/*********************************************************************/ - - -#define T15 32768 -#define T16 65536 -#define A1 37252 -#define A2 29589 - -static long xrand(void) - -{ unsigned long is1, is2; - - is1 = internal_seed / T15; - is2 = internal_seed % T15; - - internal_seed = ( (((is2 * A1) + (is1 * A2))% T16 )* T15 + (is2 * A2) ) & B; - return (long) ( internal_seed ) ; -} -#endif - -/*********************************************************************/ - - -double rand01(void) - -{ return (double) (irand() / BF) ; -} - -/*********************************************************************/ - -#define NK 12 - -double randg01(void) - -{ int i; - double sum = 0; - - for ( i = 0; i < NK; i++ ) sum += rand01(); - return sum - 6.; - - /* if NK != 12 then you must return (12/NK)*sum - (NK/2) */ -} - -#undef NK - - -/*********************************************************************/ - -long nrand ( n ) - -long n; - -{ return (long) ( rand01() * (double) n ); -} - -/*********************************************************************/ - -#undef A -#undef A1 -#undef A2 -#undef B -#undef BF -#undef T15 -#undef T16 diff --git a/isisd/topology/spacyc.c b/isisd/topology/spacyc.c deleted file mode 100644 index 91a4799ced..0000000000 --- a/isisd/topology/spacyc.c +++ /dev/null @@ -1,484 +0,0 @@ -#include <zebra.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <values.h> - -#include "random.c" - -#define DASH '-' -#define VERY_FAR 100000000 - - -/* generator of acyclic random networks for the shortest paths problem; - extended DIMACS format for output */ - -main ( argc, argv ) - -int argc; -char* argv[]; - -{ - -char args[30]; - -long n, - n0, - source, - i, - i0, - j, - dij; - -long m, - m0, - mc, - k; - -long *p, - p_t, - l, - lx; - -long seed, - seed1, - seed2; - -int ext=0; - -FILE *fout; - -/* variables for lengths generating */ -/* initialized by default values */ -int l_f = 0, ll_f = 0, lm_f = 0, ln_f = 0, ls_f = 0; -long ll = 10000, /* upper bound of the interval */ - lm = 0; /* lower bound of the interval */ -double ln = 0, /* l += ln * |i-j| */ - ls = 0; /* l += ls * |i-j|^2 */ - -/* variables for connecting path(s) */ -int c_f = 0, cl_f = 0, ch_f = 0, c_rand = 1; -long cl = 1; /* length of path arc */ -long ch; /* number of arcs in the path - n - by default */ - -/* variables for artifical source */ -int s_f = 0, sl_f = 0, sm_f = 0; -long sl = VERY_FAR, /* upper bound of artifical arc */ - sm, /* lower bound of artifical arc */ - s; - -/* variables for potentials */ -int p_f = 0, pl_f = 0, pm_f = 0, pn_f = 0, ps_f = 0, - pa_f = 0, pap_f = 0, pac_f = 0; -long pl, /* upper bound of the interval */ - pm; /* lower bound of the interval */ -double pn = 0, /* l += ln * |i-j| */ - ps = 0, /* l += ls * |i-j|^2 */ - pap = 0, /* part of nodes with alternative dustribution */ - pac = -1; /* multiplier for alternative distribution */ - -int np; /* number of parameter parsing now */ - -#define PRINT_ARC( i, j, length )\ -{\ -l = length;\ -if ( p_f ) l += ( p[i] - p[j] );\ -printf ("a %8ld %8ld %12ld\n", i, j, l );\ -} - - /* parsing parameters */ - -if ( argc < 2 ) goto usage; - -np = 0; - -strcpy ( args, argv[1] ); - - if ( ( args[0] == DASH ) && ( args[1] == 'h') - ) - goto help; - -if ( argc < 4 ) goto usage; - -/* first parameter - number of nodes */ -np = 1; -if ( ( n = atoi ( argv[1] ) ) < 2 ) goto usage; - -/* second parameter - number of arcs */ -np = 2; -if ( ( m = atoi ( argv[2] ) ) < n ) goto usage; - -/* third parameter - seed */ -np=3; -if ( ( seed = atoi ( argv[3] ) ) <= 0 ) goto usage; - -/* other parameters */ - -for ( np = 4; np < argc; np ++ ) - { - strcpy ( args, argv[np] ); - if ( args[0] != DASH ) goto usage; - - switch ( args[1] ) - { - - case 'l' : /* an interval for arc length */ - l_f = 1; - switch ( args[2] ) - { - case 'l': /* length of the interval */ - ll_f = 1; - ll = (long) atof ( &args[3] ); - break; - case 'm': /* minimal bound */ - lm_f = 1; - lm = (long ) atof ( &args[3] ); - break; - case 'n': /* additional length: l*|i-j| */ - ln_f = 1; - ln = atof ( &args[3] ); - break; - case 's': /* additional length: l*|i-j|^2 */ - ls_f = 1; - ls = atof ( &args[3] ); - break; - default: /* unknown switch value */ - goto usage; - } - break; - - case 'c' : /* connecting path(s) */ - c_f = 1; - switch ( args[2] ) - { - case 'l': /* length of path arc */ - c_rand = 0; /* fixed arc length */ - cl_f = 1; - cl = (long) atof ( &args[3] ); - break; - case 'h': /* number of arcs in connecting path */ - ch_f = 1; - ch = (long) atof ( &args[3] ); - if ( ch < 1 || ch > n ) goto usage; - break; - default: /* unknown switch value */ - goto usage; - } - break; - - case 's' : /* additional source */ - s_f = 1; - if ( strlen ( args ) > 2 ) - { - switch ( args[2] ) - { - case 'l': /* upper bound of art. arc */ - sl_f = 1; - sl = (long) atof ( &args[3] ); - break; - case 'm': /* lower bound of art. arc */ - sm_f = 1; - sm = (long) atof ( &args[3] ); - break; - default: /* unknown switch value */ - goto usage; - } - } - break; - - case 'p' : /* potentials */ - p_f = 1; - if ( strlen ( args ) > 2 ) - { - switch ( args[2] ) - { - case 'l': /* length of the interval */ - pl_f = 1; - pl = (long) atof ( &args[3] ); - break; - case 'm': /* minimal bound */ - pm_f = 1; - pm = (long ) atof ( &args[3] ); - break; - case 'n': /* additional length: l*|i-j| */ - pn_f = 1; - pn = atof ( &args[3] ); - break; - case 's': /* additional length: l*|i-j|^2 */ - ps_f = 1; - ps = atof ( &args[3] ); - break; - case 'a': /* bipolar distribution */ - pa_f = 1; - switch ( args[3] ) - { - case 'p': /* % of alternative potentials */ - pap_f = 1; - pap = atof ( &args[4] ); - if ( pap < 0 ) pap = 0; - if ( pap > 100 ) pap = 100; - pap /= 100; - break; - case 'c': /* multiplier */ - pac_f = 1; - pac = atof ( &args[4] ); - break; - default: /* unknown switch value */ - goto usage; - } - break; - default: /* unknown switch value */ - goto usage; - } - } - break; - - default : /* unknoun case */ - goto usage; - } - } - -/* ----- ajusting parameters ----- */ - -n0 = n; m0 = m; - -/* length parameters */ -if ( ll < lm ) { lx = ll; ll = lm; lm = lx; } - -/* potential parameters */ -if ( p_f ) - { - if ( ! pl_f ) pl = ll; - if ( ! pm_f ) pm = lm; - if ( pl < pm ) { lx = pl; pl = pm; pm = lx; } - } - -/* path(s) parameters */ -if ( ! ch_f ) ch = n - 1; -mc = n - 1; - - /* artifical source parameters */ -if ( s_f ) - { m0 += n; n0 ++ ; - if ( ! sm_f ) sm = sl; - if ( sl < sm ) { lx = sl; sl = sm; sm = lx; } - } - -/*----- printing title -----*/ - -printf ("c acyclic network for shortest paths problem\n"); -printf ("c extended DIMACS format\nc\n" ); - - -/* name of the problem */ -printf ("t ac_%ld_%ld_%ld_", n, m, seed ); -if ( l_f ) - printf ("%c", 'l'); -if ( c_f ) - printf ("%c", 'c'); -if ( s_f ) - printf ("%c", 's'); -if ( p_f ) - printf ("%c", 'p'); -printf ("\nc\n"); - -/* printing additional information */ -if ( l_f ) - printf ("c length -> min: %ld max: %ld k1: %.2f k2: %.2f\n", - lm, ll, ln, ls ); -if ( c_f ) - printf ("c path(s) -> number of arcs: %ld arc length: %ld\n", - ch, cl ); -if ( s_f ) - printf ("c length of arcs from artifical source -> min: %ld max: %ld\n", - sm, sl ); -if ( p_f ) - { - printf ("c potentials -> min: %ld max: %ld k1: %.2f k2: %.2f\n", - pm, pl, pn, ps ); - if ( pa_f ) - printf ("c potentials -> part of alternative distribution: %.2f k: %.2f\n", - pap, pac ); - } -printf ("c\n" ); - -printf ("p sp %8ld %8ld\nc\n", n0, m0 ); - -source = ( s_f ) ? n0 : 1; -printf ("n %8ld\nc\n", source ); - - -if ( p_f ) /* generating potentials */ - { - seed1 = 2*seed + 1; - p = (long*) calloc ( n+2, sizeof (long) ); - init_rand ( seed1); - pl = pl - pm + 1; - - for ( i = 0; i <= n; i ++ ) - { - p_t = pm + nrand ( pl ); - if ( pn_f ) p_t += (long) ( i * pn ); - if ( ps_f ) p_t += (long) ( i * ( i * ps )); - if ( pap_f ) - if ( rand01() < pap ) - p_t = (long) ( p_t * pac ); - p[i] = p_t; - } - p[n+1] = 0; - } - - -if ( s_f ) /* additional arcs from artifical source */ - { - seed2 = 3*seed + 1; - init_rand ( seed2 ); - sl = sl - sm + 1; - - for ( i = n; i > 1; i -- ) - { - s = sm + nrand ( sl ); - PRINT_ARC ( n0, i, s ) - } - - PRINT_ARC ( n0, 1, 0 ) - } - -/* initialize random number generator */ -init_rand ( seed ); -ll = ll - lm + 1; - -/* generating connecting path(s) */ -for ( i = 1; i < n; i ++ ) - { - if ( ( (i-1) % ch ) != 0 ) - i0 = i; - else - i0 = 1; - - if (c_rand) - cl = lm + nrand(ll); - PRINT_ARC ( i0, i+1, cl ) - } - -/* generating random arcs */ - - -for ( k = 1; k <= m - mc; k ++ ) - { - i = 1 + nrand ( n ); - - do - j = 1 + nrand ( n ); - while ( j == i ); - - if ( i > j ) - { i0 = i; i = j; j = i0; } - - dij = j - i; - l = lm + nrand ( ll ); - if ( ln_f ) l += (long) ( dij * ln ); - if ( ls_f ) l += (long) ( dij * ( dij * ls ) ); - PRINT_ARC ( i, j, l ); - } - -/* all is done */ -exit (ext); - -/* ----- wrong usage ----- */ - - usage: -fprintf ( stderr, -"\nusage: %s n m seed [ -ll#i -lm#i -cl#i -p -pl#i -pm#i ... ]\n\ -help: %s -h\n\n", argv[0], argv[0] ); - -if ( np > 0 ) - fprintf ( stderr, "error in parameter # %d\n\n", np ); -exit (4); - -/* ---- help ---- */ - - help: - -if ( args[2] == 'h') goto hhelp; - -fprintf ( stderr, -"\n'%s' - acyclic network generator for shortest paths problem.\n\ -Generates problems in extended DIMACS format.\n\ -\n\ - %s n m seed [ -ll#i -lm#i -cl#i -p -pl#i -pm#i ... ]\n\ - %s -hh\n\ -\n\ - #i - integer number #f - real number\n\ -\n\ --ll#i - #i is the upper bound on arc lengths (default 10000)\n\ --lm#i - #i is the lower bound on arc lengths (default 0)\n\ --cl#i - #i is length of arcs in connecting path(s) (default random)\n\ --p - generate potentials \n\ --pl#i - #i is the upper bound on potentials (default ll)\n\ --pm#i - #i is the lower bound on potentials (default lm)\n\ -\n\ --hh - extended help \n\n", -argv[0], argv[0], argv[0] ); - -exit (0); - -/* --------- sophisticated help ------------ */ - hhelp: - -if ( argc < 3 ) - fout = stderr; -else - fout = fopen ( argv[2], "w" ); - -if ( fout == NULL ) -{ fprintf ( stderr, "\nCan't open file '%s' for writing help\n\n", argv[2] ); - exit ( 2 ); -} - -fprintf (fout, -"\n'%s' - acyclic network generator for shortest paths problem.\n\ -Generates problems in extended DIMACS format.\n\ -\n\ - %s n m seed [ -ll#i -lm#i -ln#f -ls#f\n\ - -p -pl#i -pm#i -pn#f -ps#f -pap#i -pac#f\n\ - -cl#i -ch#i\n\ - -s -sl#i -sm#i\n\ - ]\n\ - %s -hh file_name\n\ -\n\ - #i - integer number #f - real number\n\ -\n\ - Arc length parameters:\n\ --ll#i - #i is the upper bound on arc lengths (default 10000)\n\ --lm#i - #i is the lower bound on arc lengths (default 0)\n\ --ln#f - multipliy l(i, j) by #f * |i-j| (default 0)\n\ --ls#f - multipliy l(i, j) by #f * |i-j|^2 (default 0)\n\ -\n\ - Potential parameters:\n\ --p - generate potentials \n\ --pl#i - #i is the upper bound on potentials (default ll)\n\ --pm#i - #i is the lower bound on potentials (default lm)\n\ --pn#f - multiply p(i) by #f * i (default 0)\n\ --ps#f - multiply p(i) by #f * i^2 (default 0)\n\ --pap#i - percentage of alternative potential nodes (default 0)\n\ --pac#f - if i is alternative, multiply p(i) by #f (default -1)\n\ -\n\ - Connecting path(s) parameters:\n\ --cl#i - #i is length of arcs in connecting path(s) (default random)\n\ --ch#i - #i is length of connecting path(s) (default n-1)\n\ -\n\ - Artificial source parameters:\n\ --s - generate artificial source with default connecting arc lengths\n\ --sl#i - #i is the upper bound on art. arc lengths (default 100000000)\n\ --sm#i - #i is the lower bound on art. arc lengths (default sl)\n\ -\n\ --hh file_name - save this help in the file 'file_name'\n\n", -argv[0], argv[0], argv[0] ); - -exit (0); -} - - - diff --git a/isisd/topology/spgrid.c b/isisd/topology/spgrid.c deleted file mode 100644 index 22cfa7ba4d..0000000000 --- a/isisd/topology/spgrid.c +++ /dev/null @@ -1,737 +0,0 @@ -#include <zebra.h> - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "random.c" - -#include "thread.h" -#include "vty.h" -#include "log.h" -#include "linklist.h" - -#include "spgrid.h" - - -#define DASH '-' -#define VERY_FAR 100000000 - -#define DOUBLE_CYCLE 0 -#define CYCLE 1 -#define PATH 2 - -#define NO 0 -#define YES 1 - -#define NODE( x, y ) (x*Y + y + 1) - -/* - * Prototypes. - */ -void free_arc(void *); -void help(struct vty *); -void print_arc(struct vty *, struct list *, long, long, long); -void hhelp(struct vty *); -void usage(struct vty *); - -const char *graph_type[] = { - "double cycle", - "cycle", - "path" -}; - -struct arc *arc; - -char args[30]; - -long X, /* horizontal size of grid */ - Y; /* vertical size of grid */ - -long x, - y, - yy1, yy2, yyp, - dl, dx, xn, yyn, count, - *mess; - -double n; -long n0, - source, - i, - i0, - j, - dij; - -double m; -long m0, - mc, - k; - -long *p, - p_t, - l, - lx; - -long seed, - seed1, - seed2; - -int ext=0; - -/* initialized by default values */ - -/* variables for generating one layer */ - -/* variables for generating spanning graph */ -int c_f = 0, cw_f = 0, cm_f = 0, cl_f = 0; - -int cw = DOUBLE_CYCLE; /* type of spanning graph */ -long cm = 0, /* lower bound of the interval */ - cl = 100; /* upper bound of the interval */ - -/* variables for generating additional arcs */ -int a_f = 0, ax_f = 0, am_f = 0, al_f = 0; - -long ax = 0, /* number of additional arcs */ - am = 0, /* lower bound of the interval */ - al = 100; /* upper bound of the interval */ - -/* variables for inter-layer arcs */ -int i_f = 0, ip_f = 0, ix_f = 0, ih_f = 0, - im_f = 0, il_f = 0, in_f = 0, is_f = 0; - -int ip = NO; /* to mess or not to mess */ -long ix = 1, /* number of interlayered arcs in a NODE */ - ih = 1, /* step between two layeres */ - il = 10000, /* upper bound of the interval */ - im = 1000; /* lower bound of the interval */ -double in = 1, /* l *= in * |x1-x2| */ - is = 0; /* l *= is * |x1-x2|^2 */ - -/* variables for artifical source */ -int s_f = 0, sl_f = 0, sm_f = 0; -long sl = VERY_FAR, /* upper bound of artifical arc */ - sm, /* lower bound of artifical arc */ - s; - -/* variables for potentials */ -int p_f = 0, pl_f = 0, pm_f = 0, pn_f = 0, ps_f = 0; - -long pl, /* upper bound of the interval */ - pm; /* lower bound of the interval */ -double pn = 0, /* p += ln * (x+1) */ - ps = 0; /* p += ls * (x+1)^2 */ - -int np; /* number of parameter parsing now */ - - -void -free_arc (void *val) { - free(val); -} - -void -print_arc (struct vty *vty, struct list *topology, long i, long j, long length) -{ - struct arc *myarc; - - l = length; - if ( p_f ) l += ( p[i] - p[j] ); -// vty_out (vty,"a %8ld %8ld %12ld%s", i, j, l ,VTY_NEWLINE); - myarc = malloc (sizeof(struct arc)); - myarc->from_node = i; - myarc->to_node = j; - myarc->distance = l; - topology->del = free_arc; - listnode_add (topology, myarc); -} - -/* ---- help ---- */ -void -help (struct vty *vty) { -// if ( args[2] == 'h') hhelp (vty); - vty_out (vty,"grid network generator for shortest paths problem.%s",VTY_NEWLINE); - vty_out (vty,"Generates problems in extended DIMACS format.%s",VTY_NEWLINE); - vty_out (vty,"X Y seed [ -cl#i -cm#i -c{c|d|p} -ip -il#i -im#i -p -pl#i -pm#i... ]%s",VTY_NEWLINE); - vty_out (vty,"#i - integer number%s",VTY_NEWLINE); - vty_out (vty,"-cl#i - #i is the upper bound on layer arc lengths (default 100)%s",VTY_NEWLINE); - vty_out (vty,"-cm#i - #i is the lower bound on layer arc lengths (default 0)%s",VTY_NEWLINE); - vty_out (vty,"-c#t - #t is the type of connecting graph: { c | d | p }%s",VTY_NEWLINE); - vty_out (vty," c - cycle, d - double cycle, p - path (default d)%s",VTY_NEWLINE); - vty_out (vty,"-ip - shuffle inter-layer arcs (default NO)%s",VTY_NEWLINE); - vty_out (vty,"-il#i - #i is the upper bound on inter-layer arc lengths (default 10000)%s",VTY_NEWLINE); - vty_out (vty,"-im#i - #i is the lower bound on inter-layer arc lengths (default 1000)%s",VTY_NEWLINE); - vty_out (vty,"-p - generate potentials%s",VTY_NEWLINE); - vty_out (vty,"-pl#i - #i is the upper bound on potentials (default il)%s",VTY_NEWLINE); - vty_out (vty,"-pm#i - #i is the lower bound on potentials (default im)%s",VTY_NEWLINE); - vty_out (vty,"%s",VTY_NEWLINE); - vty_out (vty,"-hh - extended help%s",VTY_NEWLINE); -} - -/* --------- sophisticated help ------------ */ -void -hhelp (struct vty *vty) { -/* -zlog_info ( -"\n'%s' - grid network generator for shortest paths problem.\n\ -Generates problems in extended DIMACS format.\n\ -\n\ - %s X Y seed [ -cl#i -cm#i -c{c|d|p}\n\ - -ax#i -al#i -am#i\n\ - -ip -il#i -im#i -in#i -is#i -ix#i -ih#i\n\ - -p -pl#i -pm#i -pn#f -ps#f\n\ - -s -sl#i -sm#i\n\ - ]\n\ - %s -hh file_name\n\ -\n\ - #i - integer number #f - real number\n\ -\n\ - Parameters of connecting arcs within one layer:\n\ --cl#i - #i is the upper bound on arc lengths (default 100)\n\ --cm#i - #i is the lower bound on arc lengths (default 0)\n\ --c#t - #t is the type of connecting graph: { c | d | p }\n\ - c - cycle, d - double cycle, p - path (default d)\n\ -\n\ - Parameters of additional arcs within one layer:\n\ --ax#i - #i is the number of additional arcs (default 0)\n\ --al#i - #i is the upper bound on arc lengths (default 100)\n\ --am#i - #i is the lower bound on arc lengths (default 0)\n\ -\n\ - Interlayerd arc parameters:\n\ --ip - shuffle inter-layer arcs (default NO)\n\ --il#i - #i is the upper bound on arc lengths (default 10000)\n\ --im#i - #i is the lower bound on arc lengths (default 1000)\n\ --in#f - multiply l(i, j) by #f * x(j)-x(i) (default 1)\n\ - if #f=0 - don't multiply\n\ --is#f - multiply l(i, j) by #f * (x(j)-x(i))^2 (default NO)\n\ --ix#i - #i - is the number of arcs from a node (default 1)\n\ --ih#i - #i - is the step between connected layers (default 1)\n\ -\n\ - Potential parameters:\n\ --p - generate potentials \n\ --pl#i - #i is the upper bound on potentials (default ll)\n\ --pm#i - #i is the lower bound on potentials (default lm)\n\ --pn#f - multiply p(i) by #f * x(i) (default NO)\n\ --ps#f - multiply p(i) by #f * x(i)^2 (default NO)\n\ -\n"); -zlog_info ( -" Artificial source parameters:\n\ --s - generate artificial source with default connecting arc lengths\n\ --sl#i - #i is the upper bound on art. arc lengths (default 100000000)\n\ --sm#i - #i is the lower bound on art. arc lengths (default sl)\n\" -);*/ -} - -/* ----- wrong usage ----- */ -void -usage (struct vty *vty) { - vty_out (vty,"usage: X Y seed [-ll#i -lm#i -cl#i -p -pl#i -pm#i ...]%s",VTY_NEWLINE); - vty_out (vty,"help: -h or -hh%s",VTY_NEWLINE); - - if ( np > 0 ) - zlog_err ("error in parameter # %d\n\n", np ); -} - - -/* parsing parameters */ -/* checks the validity of incoming parameters */ -int -spgrid_check_params ( struct vty *vty, int argc, const char **argv) -{ -/* initialized by default values */ - ext=0; - -/* variables for generating one layer */ - -/* variables for generating spanning graph */ - c_f = 0; - cw_f = 0; - cm_f = 0; - cl_f = 0; - - cw = PATH; /* type of spanning graph */ - cm = 0; /* lower bound of the interval */ - cl = 63; /* upper bound of the interval */ - -/* variables for generating additional arcs */ - a_f = 0; - ax_f = 0; - am_f = 0; - al_f = 0; - - ax = 0; /* number of additional arcs */ - am = 0; /* lower bound of the interval */ - al = 63; /* upper bound of the interval */ - -/* variables for inter-layer arcs */ - i_f = 0; - ip_f = 0; - ix_f = 0; - ih_f = 0; - im_f = 0; - il_f = 0; - in_f = 0; - is_f = 0; - - ip = NO; /* to mess or not to mess */ - ix = 1; /* number of interlayered arcs in a NODE */ - ih = 1; /* step between two layeres */ - il = 63; //was 10000; /* upper bound of the interval */ - im = 0; //was 1000; /* lower bound of the interval */ - in = 1; /* l *= in * |x1-x2| */ - is = 0; /* l *= is * |x1-x2|^2 */ - -/* variables for artifical source */ - s_f = 0; - sl_f = 0; - sm_f = 0; - sl = VERY_FAR; /* upper bound of artifical arc */ - -/* variables for potentials */ - p_f = 0; - pl_f = 0; - pm_f = 0; - pn_f = 0; - ps_f = 0; - - pn = 0; /* p += ln * (x+1) */ - ps = 0; /* p += ls * (x+1)^2 */ - - - if ( argc < 1 ) { - usage (vty); - return 1; - } - - np = 0; - - strcpy ( args, argv[0] ); - - if ((args[0] == DASH) && (args[1] == 'h')) - help (vty); - - if ( argc < 3 ) { - usage (vty); - return 1; - } - - /* first parameter - horizontal size */ - np = 1; - if ( ( X = atoi ( argv[0] ) ) < 1 ) { - usage (vty); - return 1; - } - - /* second parameter - vertical size */ - np = 2; - if ( ( Y = atoi ( argv[1] ) ) < 1 ) { - usage (vty); - return 1; - } - - /* third parameter - seed */ - np=3; - if ( ( seed = atoi ( argv[2] ) ) <= 0 ) { - usage (vty); - return 1; - } - - /* other parameters */ - for ( np = 3; np < argc; np ++ ) { - strcpy ( args, argv[np] ); - if ( args[0] != DASH ) { - usage (vty); - return 1; - } - - switch ( args[1] ) { - case 'c' : /* spanning graph in one layer */ - c_f = 1; - switch ( args[2] ) { - case 'l': /* upper bound of the interval */ - cl_f = 1; - cl = atol ( &args[3] ); - break; - case 'm': /* lower bound */ - cm_f = 1; - cm = atol ( &args[3] ); - break; - case 'c': /* type - cycle */ - cw_f = 1; - cw = CYCLE; - break; - case 'd': /* type - double cycle */ - cw_f = 1; - cw = DOUBLE_CYCLE; - break; - case 'p': /* type - path */ - cw_f = 1; - cw = PATH; - break; - - default: /* unknown switch value */ - usage (vty); - return 1; - } - break; - - case 'a' : /* additional arcs in one layer */ - a_f = 1; - switch ( args[2] ) - { - case 'l': /* upper bound of the interval */ - al_f = 1; - al = atol ( &args[3] ); - break; - case 'm': /* lower bound */ - am_f = 1; - am = atol ( &args[3] ); - break; - case 'x': /* number of additional arcs */ - ax_f = 1; - ax = atol ( &args[3] ); - if ( ax < 0 ) - { - usage (vty); - return 1; - } - break; - - default: /* unknown switch value */ - { - usage (vty); - return 1; - } - } - break; - - - case 'i' : /* interlayered arcs */ - i_f = 1; - - switch ( args[2] ) - { - case 'l': /* upper bound */ - il_f = 1; - il = atol ( &args[3] ); - break; - case 'm': /* lower bound */ - im_f = 1; - im = atol ( &args[3] ); - break; - case 'n': /* additional length: l *= in*|i1-i2| */ - in_f = 1; - in = atof ( &args[3] ); - break; - case 's': /* additional length: l *= is*|i1-i2|^2 */ - is_f = 1; - is = atof ( &args[3] ); - break; - case 'p': /* mess interlayered arcs */ - ip_f = 1; - ip = YES; - break; - case 'x': /* number of interlayered arcs */ - ix_f = 1; - ix = atof ( &args[3] ); - if ( ix < 1 ) { - usage (vty); - return 1; - } - break; - case 'h': /* step between two layeres */ - ih_f = 1; - ih = atof ( &args[3] ); - if ( ih < 1 ) { - usage (vty); - return 1; - } - break; - default: /* unknown switch value */ - usage (vty); - return 1; - } - break; - - case 's' : /* additional source */ - s_f = 1; - if ( strlen ( args ) > 2 ) - { - switch ( args[2] ) - { - case 'l': /* upper bound of art. arc */ - sl_f = 1; - sl = atol ( &args[3] ); - break; - case 'm': /* lower bound of art. arc */ - sm_f = 1; - sm = atol ( &args[3] ); - break; - default: /* unknown switch value */ - usage (vty); - return 1; - } - } - break; - - case 'p' : /* potentials */ - p_f = 1; - if ( strlen ( args ) > 2 ) - { - switch ( args[2] ) - { - case 'l': /* upper bound */ - pl_f = 1; - pl = atol ( &args[3] ); - break; - case 'm': /* lower bound */ - pm_f = 1; - pm = atol ( &args[3] ); - break; - case 'n': /* additional: p *= pn*(x+1) */ - pn_f = 1; - pn = atof ( &args[3] ); - break; - case 's': /* additional: p = ps* (x+1)^2 */ - ps_f = 1; - ps = atof ( &args[3] ); - break; - default: /* unknown switch value */ - usage (vty); - return 1; - } - } - break; - - default: /* unknoun case */ - usage (vty); - return 1; - } - } - - - return 0; -} - - -/* generator of layered networks for the shortest paths problem; - extended DIMACS format for output */ -int -gen_spgrid_topology (struct vty *vty, struct list *topology) -{ - /* ----- ajusting parameters ----- */ - - /* spanning */ - if ( cl < cm ) { lx = cl; cl = cm; cm = lx; } - - /* additional arcs */ - if ( al < am ) { lx = al; al = am; am = lx; } - - /* interlayered arcs */ - if ( il < im ) { lx = il; il = im; im = lx; } - - /* potential parameters */ - if ( p_f ) - { - if ( ! pl_f ) pl = il; - if ( ! pm_f ) pm = im; - if ( pl < pm ) { lx = pl; pl = pm; pm = lx; } - } - - /* number of nodes and arcs */ - - n = (double)X *(double)Y + 1; - - m = (double)Y; /* arcs from source */ - - switch ( cw ) - { - case PATH: - mc = (double)Y - 1; - break; - case CYCLE: - mc = (double)Y; - break; - case DOUBLE_CYCLE: - mc = 2*(double)Y; - } - - m += (double)X * (double)mc; /* spanning arcs */ - m += (double)X * (double)ax; /* additional arcs */ - - /* interlayered arcs */ - for ( x = 0; x < X; x ++ ) - { - dl = ( ( X - x - 1 ) + ( ih - 1 ) ) / ih; - if ( dl > ix ) dl = ix; - m += (double)Y * (double)dl; - } - - /* artifical source parameters */ - if ( s_f ) { - m += n; n ++ ; - if ( ! sm_f ) sm = sl; - if ( sl < sm ) { lx = sl; sl = sm; sm = lx; } - } - - if ( n >= (double)LONG_MAX || m >= (double)LONG_MAX ) - { - zlog_err ("Too large problem. It can't be generated\n"); - exit (4); - } - else - { - n0 = (long)n; m0 = (long)m; - } - - if ( ip_f ) - mess = (long*) calloc ( Y, sizeof ( long ) ); - - /* printing title */ - zlog_info ("Generating topology for ISIS"); - - source = ( s_f ) ? n0-1 : n0; - - if ( p_f ) /* generating potentials */ { - p = (long*) calloc ( n0+1, sizeof (long) ); - seed1 = 2*seed + 1; - init_rand ( seed1); - pl = pl - pm + 1; - - for ( x = 0; x < X; x ++ ) - for ( y = 0; y < Y; y ++ ) { - p_t = pm + nrand ( pl ); - if ( pn_f ) p_t *= (long) ( (1 + x) * pn ); - if ( ps_f ) p_t *= (long) ( (1 + x) * ( (1 + x) * ps )); - - p[ NODE ( x, y ) ] = p_t; - } - p[n0] = 0; - if ( s_f ) p[n0-1] = 0; - } - - if ( s_f ) /* additional arcs from artifical source */ - { - seed2 = 3*seed + 1; - init_rand ( seed2 ); - sl = sl - sm + 1; - - for ( x = X - 1; x >= 0; x -- ) - for ( y = Y - 1; y >= 0; y -- ) - { - i = NODE ( x, y ); - s = sm + nrand ( sl ); - print_arc (vty, topology, n0, i, s ); - } - - print_arc (vty, topology, n0, n0-1, 0 ); - } - - - /* ----- generating arcs within layers ----- */ - - init_rand ( seed ); - cl = cl - cm + 1; - al = al - am + 1; - - for ( x = 0; x < X; x ++ ) - { - /* generating arcs within one layer */ - for ( y = 0; y < Y-1; y ++ ) - { - /* generating spanning graph */ - i = NODE ( x, y ); - j = NODE ( x, y+1 ); - l = cm + nrand ( cl ); - print_arc (vty, topology, i, j, l ); - - if ( cw == DOUBLE_CYCLE ) - { - l = cm + nrand ( cl ); - print_arc (vty, topology, j, i, l ); - } - } - - if ( cw <= CYCLE ) - { - i = NODE ( x, Y-1 ); - j = NODE ( x, 0 ); - l = cm + nrand ( cl ); - print_arc (vty, topology, i, j, l ); - - if ( cw == DOUBLE_CYCLE ) - { - l = cm + nrand ( cl ); - print_arc (vty, topology, j, i, l ); - } - } - - /* generating additional arcs */ - - for ( k = ax; k > 0; k -- ) - { - yy1 = nrand ( Y ); - do - yy2 = nrand ( Y ); - while ( yy2 == yy1 ); - i = NODE ( x, yy1 ); - j = NODE ( x, yy2 ); - l = am + nrand ( al ); - print_arc (vty, topology, i, j, l ); - } - } - - /* ----- generating interlayered arcs ------ */ - - il = il - im + 1; - - /* arcs from the source */ - - for ( y = 0; y < Y; y ++ ) - { - l = im + nrand ( il ); - i = NODE ( 0, y ); - print_arc (vty, topology, source, i, l ); - } - - for ( x = 0; x < X-1; x ++ ) - { - /* generating arcs from one layer */ - for ( count = 0, xn = x + 1; - count < ix && xn < X; - count ++, xn += ih ) - { - if ( ip_f ) - for ( y = 0; y < Y; y ++ ) - mess[y] = y; - - for ( y = 0; y < Y; y ++ ) - { - i = NODE ( x, y ); - dx = xn - x; - if ( ip_f ) - { - yyp = nrand(Y-y); - yyn = mess[ yyp ]; - mess[ yyp ] = mess[ Y - y - 1 ]; - } - else - yyn = y; - j = NODE ( xn, yyn ); - l = im + nrand ( il ); - if ( in != 0 ) - l *= (long) ( in * dx ); - if ( is_f ) - l *= (long) ( ( is * dx ) * dx ); - print_arc (vty, topology, i, j, l ); - } - } - } - /* all is done */ - return ext; - -return 0; -} - - - diff --git a/isisd/topology/spgrid.h b/isisd/topology/spgrid.h deleted file mode 100644 index 1c1ceea579..0000000000 --- a/isisd/topology/spgrid.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * IS-IS Rout(e)ing protocol - topology/spgrid.h - Routines for manipulation of SSN and SRM flags - * Copyright (C) 2001 Sampo Saaristo, Ofer Wald - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public Licenseas published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful,but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/* - * Based on: - * SPLIB Copyright C 1994 by Cherkassky, Goldberg, and Radzik - * - */ -#ifndef _ZEBRA_ISIS_TOPOLOGY_SPGRID_H -#define _ZEBRA_ISIS_TOPOLOGY_SPGRID_H - -struct arc { - long from_node; - long to_node; - long distance; -}; - -int gen_spgrid_topology (struct vty *vty, struct list *topology); -int spgrid_check_params (struct vty *vty, int argc, const char **argv); - - -#endif /* _ZEBRA_ISIS_TOPOLOGY_SPGRID_H */ - - - - - - diff --git a/isisd/topology/sprand.c b/isisd/topology/sprand.c deleted file mode 100644 index 1c1eb19121..0000000000 --- a/isisd/topology/sprand.c +++ /dev/null @@ -1,501 +0,0 @@ -#include <zebra.h> - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <values.h> - -#include "random.c" - -#define DASH '-' -#define VERY_FAR 100000000 - -/* generator of random networks for the shortest paths problem; - extended DIMACS format for output */ - -main ( argc, argv ) - -int argc; -char* argv[]; - -{ - -char args[30]; - -long n, - n0, - source, - i, - i0, - j, - dij; - -long m, - m0, - mc, - k; - -long *p, - p_t, - l, - lx; - -long seed, - seed1, - seed2; - -int ext=0; - -FILE *fout; - -/* variables for lengths generating */ -/* initialized by default values */ -int l_f = 0, ll_f = 0, lm_f = 0, ln_f = 0, ls_f = 0; -long ll = 10000, /* length of the interval */ - lm = 0; /* minimal bound of the interval */ -double ln = 0, /* l += ln * |i-j| */ - ls = 0; /* l += ls * |i-j|^2 */ - -/* variables for connecting cycle(s) */ -int c_f = 0, cl_f = 0, ch_f = 0, c_random = 1; -long cl = 1; /* length of cycle arc */ -long ch; /* number of arcs in the cycle - n - by default */ - -/* variables for artifical source */ -int s_f = 0, sl_f = 0, sm_f = 0; -long sl = VERY_FAR, /* upper bound of artifical arc */ - sm, /* lower bound of artifical arc */ - s; - -/* variables for potentials */ -int p_f = 0, pl_f = 0, pm_f = 0, pn_f = 0, ps_f = 0, - pa_f = 0, pap_f = 0, pac_f = 0; -long pl, /* length of the interval */ - pm; /* minimal bound of the interval */ -double pn = 0, /* l += ln * |i-j| */ - ps = 0, /* l += ls * |i-j|^2 */ - pap = 0, /* part of nodes with alternative dustribution */ - pac = -1; /* multiplier for alternative distribution */ - -int np; /* number of parameter parsing now */ - -#define PRINT_ARC( i, j, length )\ -{\ -l = length;\ -if ( p_f ) l += ( p[i] - p[j] );\ -printf ("a %8ld %8ld %12ld\n", i, j, l );\ -} - - /* parsing parameters */ - -if ( argc < 2 ) goto usage; - -np = 0; - -strcpy ( args, argv[1] ); - - if ( ( args[0] == DASH ) && ( args[1] == 'h') - ) - goto help; - -if ( argc < 4 ) goto usage; - -/* first parameter - number of nodes */ -np = 1; -if ( ( n = atoi ( argv[1] ) ) < 2 ) goto usage; - -/* second parameter - number of arcs */ -np = 2; -if ( ( m = atoi ( argv[2] ) ) < n ) goto usage; - -/* third parameter - seed */ -np=3; -if ( ( seed = atoi ( argv[3] ) ) <= 0 ) goto usage; - -/* other parameters */ - -for ( np = 4; np < argc; np ++ ) - { - strcpy ( args, argv[np] ); - if ( args[0] != DASH ) goto usage; - - switch ( args[1] ) - { - - case 'l' : /* an interval for arc length */ - l_f = 1; - switch ( args[2] ) - { - case 'l': /* length of the interval */ - ll_f = 1; - ll = (long) atof ( &args[3] ); - break; - case 'm': /* minimal bound */ - lm_f = 1; - lm = (long ) atof ( &args[3] ); - break; - case 'n': /* additional length: l*|i-j| */ - ln_f = 1; - ln = atof ( &args[3] ); - break; - case 's': /* additional length: l*|i-j|^2 */ - ls_f = 1; - ls = atof ( &args[3] ); - break; - default: /* unknown switch value */ - goto usage; - } - break; - - case 'c' : /* connecting cycle(s) */ - c_f = 1; - switch ( args[2] ) - { - case 'l': - c_random = 0; - cl_f = 1; - cl = (long) atof ( &args[3] ); - if ( cl < 0 ) goto usage; - break; - case 'h': - ch_f = 1; - ch = (long) atof ( &args[3] ); - if ( ch < 2 || ch > n ) goto usage; - break; - default: /* unknown switch value */ - goto usage; - } - break; - - case 's' : /* additional source */ - s_f = 1; - if ( strlen ( args ) > 2 ) - { - switch ( args[2] ) - { - case 'l': /* upper bound of art. arc */ - sl_f = 1; - sl = (long) atof ( &args[3] ); - break; - case 'm': /* lower bound of art. arc */ - sm_f = 1; - sm = (long) atof ( &args[3] ); - break; - default: /* unknown switch value */ - goto usage; - } - } - break; - - case 'p' : /* potentials */ - p_f = 1; - if ( strlen ( args ) > 2 ) - { - switch ( args[2] ) - { - case 'l': /* length of the interval */ - pl_f = 1; - pl = (long) atof ( &args[3] ); - break; - case 'm': /* minimal bound */ - pm_f = 1; - pm = (long ) atof ( &args[3] ); - break; - case 'n': /* additional length: l*|i-j| */ - pn_f = 1; - pn = atof ( &args[3] ); - break; - case 's': /* additional length: l*|i-j|^2 */ - ps_f = 1; - ps = atof ( &args[3] ); - break; - case 'a': /* bipolar distribution */ - pa_f = 1; - switch ( args[3] ) - { - case 'p': /* % of alternative potentials */ - pap_f = 1; - pap = atof ( &args[4] ); - if ( pap < 0 ) pap = 0; - if ( pap > 100 ) pap = 100; - pap /= 100; - break; - case 'c': /* multiplier */ - pac_f = 1; - pac = atof ( &args[4] ); - break; - default: /* unknown switch value */ - goto usage; - } - break; - default: /* unknown switch value */ - goto usage; - } - } - break; - - default : /* unknoun case */ - goto usage; - } - } - - -/* ----- ajusting parameters ----- */ - -n0 = n; m0 = m; - -/* length parameters */ -if ( ll < lm ) { lx = ll; ll = lm; lm = lx; } - -/* potential parameters */ -if ( p_f ) - { - if ( ! pl_f ) pl = ll; - if ( ! pm_f ) pm = lm; - if ( pl < pm ) { lx = pl; pl = pm; pm = lx; } - } - -/* path(s) parameters */ -if ( ! ch_f ) ch = n; - -mc = n + (n-2) / (ch-1); -if ( mc > m ) - { fprintf ( stderr, - "Error: not enough arcs for generating connecting cycle(s)\n" ); - exit (4); - } - - /* artifical source parameters */ -if ( s_f ) - { m0 += n; n0 ++ ; - if ( ! sm_f ) sm = sl; - if ( sl < sm ) { lx = sl; sl = sm; sm = lx; } - } - -/* printing title */ -printf ("c random network for shortest paths problem\n"); -printf ("c extended DIMACS format\nc\n" ); - -/* name of the problem */ -printf ("t rd_%ld_%ld_%ld_", n, m, seed ); -if ( l_f ) - printf ("%c", 'l'); -if ( c_f ) - printf ("%c", 'c'); -if ( s_f ) - printf ("%c", 's'); -if ( p_f ) - printf ("%c", 'p'); -printf ("\nc\n"); - -/* printing additional information */ -if ( l_f ) - printf ("c length -> min: %ld max: %ld k1: %.2f k2: %.2f\n", - lm, ll, ln, ls ); -if ( c_f ) - { - if ( c_random ) - printf ("c cycle -> number of arcs: %ld arc length: random\n", ch); - else - printf ("c cycle -> number of arcs: %ld arc length: %ld\n", - ch, cl ); - } -if ( s_f ) - printf ("c length of arcs from artifical source -> min: %ld max: %ld\n", - sm, sl ); -if ( p_f ) - { - printf ("c potentials -> min: %ld max: %ld k1: %.2f k2: %.2f\n", - pm, pl, pn, ps ); - if ( pa_f ) - printf ("c potentials -> part of alternative distribution: %.2f k: %.2f\n", - pap, pac ); - } -printf ("c\n" ); - - -printf ("p sp %8ld %8ld\nc\n", n0, m0 ); - -source = ( s_f ) ? n0 : 1; -printf ("n %8ld\nc\n", source ); - -if ( p_f ) /* generating potentials */ - { - p = (long*) calloc ( n+2, sizeof (long) ); - seed1 = 2*seed + 1; - init_rand ( seed1); - pl = pl - pm + 1; - - for ( i = 0; i <= n; i ++ ) - { - p_t = pm + nrand ( pl ); - if ( pn_f ) p_t += (long) ( i * pn ); - if ( ps_f ) p_t += (long) ( i * ( i * ps )); - if ( pap_f ) - if ( rand01() < pap ) - p_t = (long) ( p_t * pac ); - p[i] = p_t; - } - p[n+1] = 0; - } - - -if ( s_f ) /* additional arcs from artifical source */ - { - seed2 = 3*seed + 1; - init_rand ( seed2 ); - sl = sl - sm + 1; - - for ( i = n; i > 1; i -- ) - { - s = sm + nrand ( sl ); - PRINT_ARC ( n0, i, s ) - } - - PRINT_ARC ( n0, 1, 0 ) - } - -/* initialize random number generator */ -init_rand ( seed ); -ll = ll - lm + 1; - -/* generating connecting cycle(s) */ -if (c_random) - cl = lm + nrand ( ll ); -PRINT_ARC ( 1, 2, cl ) -if (c_random) - cl = lm + nrand ( ll ); -PRINT_ARC ( n, 1, cl ) - -for ( i = 2; i < n; i ++ ) - { - if (c_random) - cl = lm + nrand ( ll ); - - if ( ( (i-1) % (ch-1) ) != 0 ) - PRINT_ARC ( i, i+1, cl ) - else - { PRINT_ARC ( i, 1, cl ) - if (c_random) - cl = lm + nrand ( ll ); - PRINT_ARC ( 1, i+1, cl ) - } - } - -/* generating random arcs */ - -for ( k = 1; k <= m - mc; k ++ ) - { - i = 1 + nrand ( n ); - - do - j = 1 + nrand ( n ); - while ( j == i ); - - dij = ( i > j ) ? ( i - j ) : ( j - i ); - l = lm + nrand ( ll ); - if ( ln_f ) l += (long) ( dij * ln ); - if ( ls_f ) l += (long) ( dij * ( dij * ls ) ); - PRINT_ARC ( i, j, l ); - } - -/* all is done */ -exit (ext); - -/* ----- wrong usage ----- */ - - usage: -fprintf ( stderr, -"\nusage: %s n m seed [ -ll#i -lm#i -cl#i -p -pl#i -pm#i ... ]\n\ -help: %s -h\n\n", argv[0], argv[0] ); - -if ( np > 0 ) - fprintf ( stderr, "error in parameter # %d\n\n", np ); -exit (4); - -/* ---- help ---- */ - - help: - -if ( args[2] == 'h') goto hhelp; - -fprintf ( stderr, -"\n'%s' - random network generator for shortest paths problem.\n\ -Generates problems in extended DIMACS format.\n\ -\n\ - %s n m seed [ -ll#i -lm#i -cl#i -p -pl#i -pm#i ... ]\n\ - %s -hh\n\ -\n\ - #i - integer number #f - real number\n\ -\n\ --ll#i - #i is the upper bound on arc lengths (default 10000)\n\ --lm#i - #i is the lower bound on arc lengths (default 0)\n\ --cl#i - #i is length of arcs in connecting cycle(s) (default random)\n\ --p - generate potentials \n\ --pl#i - #i is the upper bound on potentials (default ll)\n\ --pm#i - #i is the lower bound on potentials (default lm)\n\ -\n\ --hh - extended help \n\n", -argv[0], argv[0], argv[0] ); - -exit (0); - -/* --------- sophisticated help ------------ */ - hhelp: - -if ( argc < 3 ) - fout = stderr; -else - fout = fopen ( argv[2], "w" ); - -if ( fout == NULL ) -{ fprintf ( stderr, "\nCan't open file '%s' for writing help\n\n", argv[2] ); - exit ( 2 ); -} - -fprintf (fout, -"\n'%s' - random network generator for shortest paths problem.\n\ -Generates problems in extended DIMACS format.\n\ -\n\ - %s n m seed [ -ll#i -lm#i -ln#f -ls#f\n\ - -p -pl#i -pm#i -pn#f -ps#f -pap#i -pac#f\n\ - -cl#i -ch#i\n\ - -s -sl#i -sm#i\n\ - ]\n\ - %s -hh file_name\n\ -\n\ - #i - integer number #f - real number\n\ -\n\ - Arc length parameters:\n\ --ll#i - #i is the upper bound on arc lengths (default 10000)\n\ --lm#i - #i is the lower bound on arc lengths (default 0)\n\ --ln#f - multipliy l(i, j) by #f * |i-j| (default 0)\n\ --ls#f - multipliy l(i, j) by #f * |i-j|^2 (default 0)\n\ -\n\ - Potential parameters:\n\ --p - generate potentials \n\ --pl#i - #i is the upper bound on potentials (default ll)\n\ --pm#i - #i is the lower bound on potentials (default lm)\n\ --pn#f - multiply p(i) by #f * i (default 0)\n\ --ps#f - multiply p(i) by #f * i^2 (default 0)\n\ --pap#i - percentage of alternative potential nodes (default 0)\n\ --pac#f - if i is alternative, multiply p(i) by #f (default -1)\n\ -\n\ - Connecting cycle(s) parameters:\n\ --cl#i - #i is length of arcs in connecting cycle(s) (default random)\n\ --ch#i - #i is length of connecting cycles (default n)\n\ -\n\ - Artificial source parameters:\n\ --s - generate artificial source with default connecting arc lengths\n\ --sl#i - #i is the upper bound on art. arc lengths (default 100000000)\n\ --sm#i - #i is the lower bound on art. arc lengths (default sl)\n\ -\n\ --hh file_name - save this help in the file 'file_name'\n\n", -argv[0], argv[0], argv[0] ); - -exit (0); -} - - - diff --git a/lib/Makefile.am b/lib/Makefile.am index f0d5bd53db..cf6c6cd1a7 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -10,24 +10,24 @@ lib_LTLIBRARIES = libzebra.la libzebra_la_LDFLAGS = -version-info 0:0:0 libzebra_la_SOURCES = \ - network.c pid_output.c getopt.c getopt1.c daemon.c \ + network.c pid_output.c getopt.c getopt1.c \ checksum.c vector.c linklist.c vty.c \ graph.c command_parse.y command_lex.l command_match.c \ command.c \ sockunion.c prefix.c thread.c if.c buffer.c table.c hash.c \ - filter.c routemap.c distribute.c stream.c str.c log.c plist.c \ + filter.c routemap.c distribute.c stream.c log.c plist.c \ zclient.c sockopt.c smux.c agentx.c snmp.c md5.c if_rmap.c keychain.c privs.c \ sigevent.c pqueue.c jhash.c workqueue.c nexthop.c json.c \ ptm_lib.c csv.c bfd.c vrf.c systemd.c ns.c memory.c memory_vty.c \ imsg-buffer.c imsg.c skiplist.c \ qobj.c \ - event_counter.c + event_counter.c \ + strlcpy.c \ + strlcat.c BUILT_SOURCES = route_types.h gitversion.h command_parse.h -libzebra_la_DEPENDENCIES = @LIB_REGEX@ - -libzebra_la_LIBADD = @LIB_REGEX@ @LIBCAP@ +libzebra_la_LIBADD = @LIBCAP@ pkginclude_HEADERS = \ buffer.h checksum.h filter.h getopt.h hash.h \ @@ -35,7 +35,7 @@ pkginclude_HEADERS = \ graph.h command_match.h \ command.h \ memory.h network.h prefix.h routemap.h distribute.h sockunion.h \ - str.h stream.h table.h thread.h vector.h version.h vty.h zebra.h \ + stream.h table.h thread.h vector.h version.h vty.h zebra.h \ plist.h zclient.h sockopt.h smux.h md5.h if_rmap.h keychain.h \ privs.h sigevent.h pqueue.h jhash.h zassert.h \ workqueue.h route_types.h libospf.h nexthop.h json.h \ @@ -48,7 +48,6 @@ noinst_HEADERS = \ plist_int.h EXTRA_DIST = \ - regex.c regex-gnu.h \ queue.h \ route_types.pl route_types.txt \ gitversion.pl diff --git a/lib/bitfield.h b/lib/bitfield.h index 6c97ac0f19..7062796a99 100644 --- a/lib/bitfield.h +++ b/lib/bitfield.h @@ -106,7 +106,7 @@ typedef unsigned int word_t; /* Find a clear bit in v and assign it to b. */ #define bf_find_bit(v, b) \ do { \ - word_t word; \ + word_t word = 0; \ unsigned int w, sh; \ for (w = 0; w <= (v).n; w++) { \ if ((word = (v).data[w]) != WORD_MAX) break; \ diff --git a/lib/daemon.c b/lib/daemon.c deleted file mode 100644 index c473555bb5..0000000000 --- a/lib/daemon.c +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Daemonize routine - * Copyright (C) 1997, 1999 Kunihiro Ishiguro - * - * This file is part of GNU Zebra. - * - * GNU Zebra is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 2, or (at your - * option) any later version. - * - * GNU Zebra is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Zebra; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include <zebra.h> -#include <log.h> - -#ifndef HAVE_DAEMON - -/* Daemonize myself. */ -int -daemon (int nochdir, int noclose) -{ - pid_t pid; - - pid = fork (); - - /* In case of fork is error. */ - if (pid < 0) - { - zlog_err ("fork failed: %s", safe_strerror(errno)); - return -1; - } - - /* In case of this is parent process. */ - if (pid != 0) - exit (0); - - /* Become session leader and get pid. */ - pid = setsid(); - - if (pid == -1) - { - zlog_err ("setsid failed: %s", safe_strerror(errno)); - return -1; - } - - /* Change directory to root. */ - if (! nochdir) - chdir ("/"); - - /* File descriptor close. */ - if (! noclose) - { - int fd; - - fd = open ("/dev/null", O_RDWR, 0); - if (fd != -1) - { - dup2 (fd, STDIN_FILENO); - dup2 (fd, STDOUT_FILENO); - dup2 (fd, STDERR_FILENO); - if (fd > 2) - close (fd); - } - } - - umask (0027); - - return 0; -} - -#endif /* HAVE_DAEMON */ @@ -34,7 +34,6 @@ #include "memory.h" #include "table.h" #include "buffer.h" -#include "str.h" #include "log.h" DEFINE_MTYPE( LIB, IF, "Interface") @@ -1169,30 +1168,6 @@ connected_add_by_prefix (struct interface *ifp, struct prefix *p, return ifc; } -#ifndef HAVE_IF_NAMETOINDEX -ifindex_t -if_nametoindex (const char *name) -{ - struct interface *ifp; - - return ((ifp = if_lookup_by_name_len(name, strnlen(name, IFNAMSIZ))) != NULL) - ? ifp->ifindex : 0; -} -#endif - -#ifndef HAVE_IF_INDEXTONAME -char * -if_indextoname (ifindex_t ifindex, char *name) -{ - struct interface *ifp; - - if (!(ifp = if_lookup_by_index(ifindex))) - return NULL; - strncpy (name, ifp->name, IFNAMSIZ); - return ifp->name; -} -#endif - #if 0 /* this route_table of struct connected's is unused * however, it would be good to use a route_table rather than * a list.. @@ -479,13 +479,6 @@ extern struct nbr_connected *nbr_connected_new (void); extern void nbr_connected_free (struct nbr_connected *); struct nbr_connected *nbr_connected_check (struct interface *, struct prefix *); -#ifndef HAVE_IF_NAMETOINDEX -extern ifindex_t if_nametoindex (const char *); -#endif -#ifndef HAVE_IF_INDEXTONAME -extern char *if_indextoname (ifindex_t, char *); -#endif - /* link parameters */ struct if_link_params *if_link_params_get (struct interface *); void if_link_params_free (struct interface *); diff --git a/lib/memory_vty.c b/lib/memory_vty.c index ff0363d45a..149b329130 100644 --- a/lib/memory_vty.c +++ b/lib/memory_vty.c @@ -22,9 +22,9 @@ #include <zebra.h> /* malloc.h is generally obsolete, however GNU Libc mallinfo wants it. */ -#if !defined(HAVE_STDLIB_H) || (defined(GNU_LINUX) && defined(HAVE_MALLINFO)) +#if (defined(GNU_LINUX) && defined(HAVE_MALLINFO)) #include <malloc.h> -#endif /* !HAVE_STDLIB_H || HAVE_MALLINFO */ +#endif /* HAVE_MALLINFO */ #include "log.h" #include "memory.h" diff --git a/lib/nexthop.c b/lib/nexthop.c index 23ee28b7dc..7b8ac95e83 100644 --- a/lib/nexthop.c +++ b/lib/nexthop.c @@ -23,7 +23,6 @@ #include "prefix.h" #include "table.h" #include "memory.h" -#include "str.h" #include "command.h" #include "if.h" #include "log.h" @@ -83,7 +82,6 @@ nexthop_type_to_str (enum nexthop_types_t nh_type) static const char *desc[] = { "none", "Directly connected", - "Interface route", "IPv4 nexthop", "IPv4 nexthop with ifindex", "IPv6 nexthop", diff --git a/lib/pid_output.c b/lib/pid_output.c index de4c2fba99..ba1f37476e 100644 --- a/lib/pid_output.c +++ b/lib/pid_output.c @@ -27,35 +27,6 @@ #include "network.h" #define PIDFILE_MASK 0644 -#ifndef HAVE_FCNTL - -pid_t -pid_output (const char *path) -{ - FILE *fp; - pid_t pid; - mode_t oldumask; - - pid = getpid(); - - oldumask = umask(0777 & ~PIDFILE_MASK); - fp = fopen (path, "w"); - if (fp != NULL) - { - fprintf (fp, "%d\n", (int) pid); - fclose (fp); - umask(oldumask); - return pid; - } - /* XXX Why do we continue instead of exiting? This seems incompatible - with the behavior of the fcntl version below. */ - zlog_warn("Can't fopen pid lock file %s (%s), continuing", - path, safe_strerror(errno)); - umask(oldumask); - return -1; -} - -#else /* HAVE_FCNTL */ pid_t pid_output (const char *path) @@ -107,5 +78,3 @@ pid_output (const char *path) } return pid; } - -#endif /* HAVE_FCNTL */ diff --git a/lib/regex-gnu.h b/lib/regex-gnu.h deleted file mode 100644 index 4cee464f20..0000000000 --- a/lib/regex-gnu.h +++ /dev/null @@ -1,542 +0,0 @@ -/* Definitions for data structures and routines for the regular - expression library, version 0.12. - Copyright (C) 1985,89,90,91,92,93,95,96,97,98 Free Software Foundation, Inc. - - This file is part of the GNU C Library. Its master source is NOT part of - the C library, however. The master source lives in /gd/gnu/lib. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef _REGEX_H -#define _REGEX_H 1 - -/* Allow the use in C++ code. */ -#ifdef __cplusplus -extern "C" { -#endif - -/* POSIX says that <sys/types.h> must be included (by the caller) before - <regex.h>. */ - -#if !defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE && defined VMS -/* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it - should be there. */ -# include <stddef.h> -#endif - -/* The following two types have to be signed and unsigned integer type - wide enough to hold a value of a pointer. For most ANSI compilers - ptrdiff_t and size_t should be likely OK. Still size of these two - types is 2 for Microsoft C. Ugh... */ -typedef long int s_reg_t; -typedef unsigned long int active_reg_t; - -/* The following bits are used to determine the regexp syntax we - recognize. The set/not-set meanings are chosen so that Emacs syntax - remains the value 0. The bits are given in alphabetical order, and - the definitions shifted by one from the previous bit; thus, when we - add or remove a bit, only one other definition need change. */ -typedef unsigned long int reg_syntax_t; - -/* If this bit is not set, then \ inside a bracket expression is literal. - If set, then such a \ quotes the following character. */ -#define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1) - -/* If this bit is not set, then + and ? are operators, and \+ and \? are - literals. - If set, then \+ and \? are operators and + and ? are literals. */ -#define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1) - -/* If this bit is set, then character classes are supported. They are: - [:alpha:], [:upper:], [:lower:], [:digit:], [:alnum:], [:xdigit:], - [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:]. - If not set, then character classes are not supported. */ -#define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1) - -/* If this bit is set, then ^ and $ are always anchors (outside bracket - expressions, of course). - If this bit is not set, then it depends: - ^ is an anchor if it is at the beginning of a regular - expression or after an open-group or an alternation operator; - $ is an anchor if it is at the end of a regular expression, or - before a close-group or an alternation operator. - - This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because - POSIX draft 11.2 says that * etc. in leading positions is undefined. - We already implemented a previous draft which made those constructs - invalid, though, so we haven't changed the code back. */ -#define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1) - -/* If this bit is set, then special characters are always special - regardless of where they are in the pattern. - If this bit is not set, then special characters are special only in - some contexts; otherwise they are ordinary. Specifically, - * + ? and intervals are only special when not after the beginning, - open-group, or alternation operator. */ -#define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1) - -/* If this bit is set, then *, +, ?, and { cannot be first in an re or - immediately after an alternation or begin-group operator. */ -#define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1) - -/* If this bit is set, then . matches newline. - If not set, then it doesn't. */ -#define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1) - -/* If this bit is set, then . doesn't match NUL. - If not set, then it does. */ -#define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1) - -/* If this bit is set, nonmatching lists [^...] do not match newline. - If not set, they do. */ -#define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1) - -/* If this bit is set, either \{...\} or {...} defines an - interval, depending on RE_NO_BK_BRACES. - If not set, \{, \}, {, and } are literals. */ -#define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1) - -/* If this bit is set, +, ? and | aren't recognized as operators. - If not set, they are. */ -#define RE_LIMITED_OPS (RE_INTERVALS << 1) - -/* If this bit is set, newline is an alternation operator. - If not set, newline is literal. */ -#define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1) - -/* If this bit is set, then `{...}' defines an interval, and \{ and \} - are literals. - If not set, then `\{...\}' defines an interval. */ -#define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1) - -/* If this bit is set, (...) defines a group, and \( and \) are literals. - If not set, \(...\) defines a group, and ( and ) are literals. */ -#define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1) - -/* If this bit is set, then \<digit> matches <digit>. - If not set, then \<digit> is a back-reference. */ -#define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1) - -/* If this bit is set, then | is an alternation operator, and \| is literal. - If not set, then \| is an alternation operator, and | is literal. */ -#define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1) - -/* If this bit is set, then an ending range point collating higher - than the starting range point, as in [z-a], is invalid. - If not set, then when ending range point collates higher than the - starting range point, the range is ignored. */ -#define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1) - -/* If this bit is set, then an unmatched ) is ordinary. - If not set, then an unmatched ) is invalid. */ -#define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1) - -/* If this bit is set, succeed as soon as we match the whole pattern, - without further backtracking. */ -#define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1) - -/* If this bit is set, do not process the GNU regex operators. - If not set, then the GNU regex operators are recognized. */ -#define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1) - -/* If this bit is set, turn on internal regex debugging. - If not set, and debugging was on, turn it off. - This only works if regex.c is compiled -DDEBUG. - We define this bit always, so that all that's needed to turn on - debugging is to recompile regex.c; the calling code can always have - this bit set, and it won't affect anything in the normal case. */ -#define RE_DEBUG (RE_NO_GNU_OPS << 1) - -/* This global variable defines the particular regexp syntax to use (for - some interfaces). When a regexp is compiled, the syntax used is - stored in the pattern buffer, so changing this does not affect - already-compiled regexps. */ -extern reg_syntax_t re_syntax_options; - -/* Define combinations of the above bits for the standard possibilities. - (The [[[ comments delimit what gets put into the Texinfo file, so - don't delete them!) */ -/* [[[begin syntaxes]]] */ -#define RE_SYNTAX_EMACS 0 - -#define RE_SYNTAX_AWK \ - (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \ - | RE_NO_BK_PARENS | RE_NO_BK_REFS \ - | RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \ - | RE_DOT_NEWLINE | RE_CONTEXT_INDEP_ANCHORS \ - | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS) - -#define RE_SYNTAX_GNU_AWK \ - ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG) \ - & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS)) - -#define RE_SYNTAX_POSIX_AWK \ - (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \ - | RE_INTERVALS | RE_NO_GNU_OPS) - -#define RE_SYNTAX_GREP \ - (RE_BK_PLUS_QM | RE_CHAR_CLASSES \ - | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \ - | RE_NEWLINE_ALT) - -#define RE_SYNTAX_EGREP \ - (RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \ - | RE_NEWLINE_ALT | RE_NO_BK_PARENS \ - | RE_NO_BK_VBAR) - -#define RE_SYNTAX_POSIX_EGREP \ - (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES) - -/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */ -#define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC - -#define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC - -/* Syntax bits common to both basic and extended POSIX regex syntax. */ -#define _RE_SYNTAX_POSIX_COMMON \ - (RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \ - | RE_INTERVALS | RE_NO_EMPTY_RANGES) - -#define RE_SYNTAX_POSIX_BASIC \ - (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM) - -/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes - RE_LIMITED_OPS, i.e., \? \+ \| are not recognized. Actually, this - isn't minimal, since other operators, such as \`, aren't disabled. */ -#define RE_SYNTAX_POSIX_MINIMAL_BASIC \ - (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS) - -#define RE_SYNTAX_POSIX_EXTENDED \ - (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES \ - | RE_NO_BK_PARENS | RE_NO_BK_VBAR \ - | RE_UNMATCHED_RIGHT_PAREN_ORD) - -/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INVALID_OPS - replaces RE_CONTEXT_INDEP_OPS and RE_NO_BK_REFS is added. */ -#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED \ - (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES \ - | RE_NO_BK_PARENS | RE_NO_BK_REFS \ - | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) -/* [[[end syntaxes]]] */ - -/* Maximum number of duplicates an interval can allow. Some systems - (erroneously) define this in other header files, but we want our - value, so remove any previous define. */ -#ifdef RE_DUP_MAX -# undef RE_DUP_MAX -#endif -/* If sizeof(int) == 2, then ((1 << 15) - 1) overflows. */ -#define RE_DUP_MAX (0x7fff) - - -/* POSIX `cflags' bits (i.e., information for `regcomp'). */ - -/* If this bit is set, then use extended regular expression syntax. - If not set, then use basic regular expression syntax. */ -#define REG_EXTENDED 1 - -/* If this bit is set, then ignore case when matching. - If not set, then case is significant. */ -#define REG_ICASE (REG_EXTENDED << 1) - -/* If this bit is set, then anchors do not match at newline - characters in the string. - If not set, then anchors do match at newlines. */ -#define REG_NEWLINE (REG_ICASE << 1) - -/* If this bit is set, then report only success or fail in regexec. - If not set, then returns differ between not matching and errors. */ -#define REG_NOSUB (REG_NEWLINE << 1) - - -/* POSIX `eflags' bits (i.e., information for regexec). */ - -/* If this bit is set, then the beginning-of-line operator doesn't match - the beginning of the string (presumably because it's not the - beginning of a line). - If not set, then the beginning-of-line operator does match the - beginning of the string. */ -#define REG_NOTBOL 1 - -/* Like REG_NOTBOL, except for the end-of-line. */ -#define REG_NOTEOL (1 << 1) - - -/* If any error codes are removed, changed, or added, update the - `re_error_msg' table in regex.c. */ -typedef enum -{ -#ifdef _XOPEN_SOURCE - REG_ENOSYS = -1, /* This will never happen for this implementation. */ -#endif - - REG_NOERROR = 0, /* Success. */ - REG_NOMATCH, /* Didn't find a match (for regexec). */ - - /* POSIX regcomp return error codes. (In the order listed in the - standard.) */ - REG_BADPAT, /* Invalid pattern. */ - REG_ECOLLATE, /* Not implemented. */ - REG_ECTYPE, /* Invalid character class name. */ - REG_EESCAPE, /* Trailing backslash. */ - REG_ESUBREG, /* Invalid back reference. */ - REG_EBRACK, /* Unmatched left bracket. */ - REG_EPAREN, /* Parenthesis imbalance. */ - REG_EBRACE, /* Unmatched \{. */ - REG_BADBR, /* Invalid contents of \{\}. */ - REG_ERANGE, /* Invalid range end. */ - REG_ESPACE, /* Ran out of memory. */ - REG_BADRPT, /* No preceding re for repetition op. */ - - /* Error codes we've added. */ - REG_EEND, /* Premature end. */ - REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ - REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ -} reg_errcode_t; - -/* This data structure represents a compiled pattern. Before calling - the pattern compiler, the fields `buffer', `allocated', `fastmap', - `translate', and `no_sub' can be set. After the pattern has been - compiled, the `re_nsub' field is available. All other fields are - private to the regex routines. */ - -#ifndef RE_TRANSLATE_TYPE -# define RE_TRANSLATE_TYPE char * -#endif - -struct re_pattern_buffer -{ -/* [[[begin pattern_buffer]]] */ - /* Space that holds the compiled pattern. It is declared as - `unsigned char *' because its elements are - sometimes used as array indexes. */ - unsigned char *buffer; - - /* Number of bytes to which `buffer' points. */ - unsigned long int allocated; - - /* Number of bytes actually used in `buffer'. */ - unsigned long int used; - - /* Syntax setting with which the pattern was compiled. */ - reg_syntax_t syntax; - - /* Pointer to a fastmap, if any, otherwise zero. re_search uses - the fastmap, if there is one, to skip over impossible - starting points for matches. */ - char *fastmap; - - /* Either a translate table to apply to all characters before - comparing them, or zero for no translation. The translation - is applied to a pattern when it is compiled and to a string - when it is matched. */ - RE_TRANSLATE_TYPE translate; - - /* Number of subexpressions found by the compiler. */ - size_t re_nsub; - - /* Zero if this pattern cannot match the empty string, one else. - Well, in truth it's used only in `re_search_2', to see - whether or not we should use the fastmap, so we don't set - this absolutely perfectly; see `re_compile_fastmap' (the - `duplicate' case). */ - unsigned can_be_null : 1; - - /* If REGS_UNALLOCATED, allocate space in the `regs' structure - for `max (RE_NREGS, re_nsub + 1)' groups. - If REGS_REALLOCATE, reallocate space if necessary. - If REGS_FIXED, use what's there. */ -#define REGS_UNALLOCATED 0 -#define REGS_REALLOCATE 1 -#define REGS_FIXED 2 - unsigned regs_allocated : 2; - - /* Set to zero when `regex_compile' compiles a pattern; set to one - by `re_compile_fastmap' if it updates the fastmap. */ - unsigned fastmap_accurate : 1; - - /* If set, `re_match_2' does not return information about - subexpressions. */ - unsigned no_sub : 1; - - /* If set, a beginning-of-line anchor doesn't match at the - beginning of the string. */ - unsigned not_bol : 1; - - /* Similarly for an end-of-line anchor. */ - unsigned not_eol : 1; - - /* If true, an anchor at a newline matches. */ - unsigned newline_anchor : 1; - -/* [[[end pattern_buffer]]] */ -}; - -typedef struct re_pattern_buffer regex_t; - -/* Type for byte offsets within the string. POSIX mandates this. */ -typedef int regoff_t; - - -/* This is the structure we store register match data in. See - regex.texinfo for a full description of what registers match. */ -struct re_registers -{ - unsigned num_regs; - regoff_t *start; - regoff_t *end; -}; - - -/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer, - `re_match_2' returns information about at least this many registers - the first time a `regs' structure is passed. */ -#ifndef RE_NREGS -# define RE_NREGS 30 -#endif - - -/* POSIX specification for registers. Aside from the different names than - `re_registers', POSIX uses an array of structures, instead of a - structure of arrays. */ -typedef struct -{ - regoff_t rm_so; /* Byte offset from string's start to substring's start. */ - regoff_t rm_eo; /* Byte offset from string's start to substring's end. */ -} regmatch_t; - -/* Declarations for routines. */ - -/* To avoid duplicating every routine declaration -- once with a - prototype (if we are ANSI), and once without (if we aren't) -- we - use the following macro to declare argument types. This - unfortunately clutters up the declarations a bit, but I think it's - worth it. */ - -#if __STDC__ - -# define _RE_ARGS(args) args - -#else /* not __STDC__ */ - -# define _RE_ARGS(args) () - -#endif /* not __STDC__ */ - -/* Sets the current default syntax to SYNTAX, and return the old syntax. - You can also simply assign to the `re_syntax_options' variable. */ -extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax)); - -/* Compile the regular expression PATTERN, with length LENGTH - and syntax given by the global `re_syntax_options', into the buffer - BUFFER. Return NULL if successful, and an error string if not. */ -extern const char *re_compile_pattern - _RE_ARGS ((const char *pattern, size_t length, - struct re_pattern_buffer *buffer)); - - -/* Compile a fastmap for the compiled pattern in BUFFER; used to - accelerate searches. Return 0 if successful and -2 if was an - internal error. */ -extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer)); - - -/* Search in the string STRING (with length LENGTH) for the pattern - compiled into BUFFER. Start searching at position START, for RANGE - characters. Return the starting position of the match, -1 for no - match, or -2 for an internal error. Also return register - information in REGS (if REGS and BUFFER->no_sub are nonzero). */ -extern int re_search - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, - int length, int start, int range, struct re_registers *regs)); - - -/* Like `re_search', but search in the concatenation of STRING1 and - STRING2. Also, stop searching at index START + STOP. */ -extern int re_search_2 - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, - int length1, const char *string2, int length2, - int start, int range, struct re_registers *regs, int stop)); - - -/* Like `re_search', but return how many characters in STRING the regexp - in BUFFER matched, starting at position START. */ -extern int re_match - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, - int length, int start, struct re_registers *regs)); - - -/* Relates to `re_match' as `re_search_2' relates to `re_search'. */ -extern int re_match_2 - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, - int length1, const char *string2, int length2, - int start, struct re_registers *regs, int stop)); - - -/* Set REGS to hold NUM_REGS registers, storing them in STARTS and - ENDS. Subsequent matches using BUFFER and REGS will use this memory - for recording register information. STARTS and ENDS must be - allocated with malloc, and must each be at least `NUM_REGS * sizeof - (regoff_t)' bytes long. - - If NUM_REGS == 0, then subsequent matches should allocate their own - register data. - - Unless this function is called, the first search or match using - PATTERN_BUFFER will allocate its own register data, without - freeing the old data. */ -extern void re_set_registers - _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs, - unsigned num_regs, regoff_t *starts, regoff_t *ends)); - -#if defined _REGEX_RE_COMP || defined _LIBC -# ifndef _CRAY -/* 4.2 bsd compatibility. */ -extern char *re_comp _RE_ARGS ((const char *)); -extern int re_exec _RE_ARGS ((const char *)); -# endif -#endif - -/* POSIX compatibility. */ -extern int regcomp _RE_ARGS ((regex_t *__preg, const char *__pattern, - int __cflags)); - -extern int regexec _RE_ARGS ((const regex_t *__preg, - const char *__string, size_t __nmatch, - regmatch_t __pmatch[], int __eflags)); - -extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg, - char *__errbuf, size_t __errbuf_size)); - -extern void regfree _RE_ARGS ((regex_t *__preg)); - - -#ifdef __cplusplus -} -#endif /* C++ */ - -#endif /* regex.h */ - -/* -Local variables: -make-backup-files: t -version-control: t -trim-versions-without-asking: nil -End: -*/ diff --git a/lib/regex.c b/lib/regex.c deleted file mode 100644 index 122f447640..0000000000 --- a/lib/regex.c +++ /dev/null @@ -1,5895 +0,0 @@ -/* Extended regular expression matching and search library, - version 0.12. - (Implements POSIX draft P1003.2/D11.2, except for some of the - internationalization features.) - Copyright (C) 1993, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -/* AIX requires this to be the first thing in the file. */ -#if defined _AIX && !defined REGEX_MALLOC - #pragma alloca -#endif - -#undef _GNU_SOURCE -#define _GNU_SOURCE - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif -#ifdef _WIN32 -/* Windows does not provide unistd.h, which is required for abort() */ -#include <process.h> -#endif /* _WIN32 */ - -#ifndef PARAMS -# if defined __GNUC__ || (defined __STDC__ && __STDC__) -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif /* GCC. */ -#endif /* Not PARAMS. */ - -#if defined STDC_HEADERS && !defined emacs -# include <stddef.h> -#else -/* We need this for `regex.h', and perhaps for the Emacs include files. */ -# include <sys/types.h> -#endif - -#define WIDE_CHAR_SUPPORT (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC) - -/* For platform which support the ISO C amendement 1 functionality we - support user defined character classes. */ -#if defined _LIBC || WIDE_CHAR_SUPPORT -/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */ -# include <wchar.h> -# include <wctype.h> -#endif - -#ifdef _LIBC -/* We have to keep the namespace clean. */ -# define regfree(preg) __regfree (preg) -# define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef) -# define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags) -# define regerror(errcode, preg, errbuf, errbuf_size) \ - __regerror(errcode, preg, errbuf, errbuf_size) -# define re_set_registers(bu, re, nu, st, en) \ - __re_set_registers (bu, re, nu, st, en) -# define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \ - __re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) -# define re_match(bufp, string, size, pos, regs) \ - __re_match (bufp, string, size, pos, regs) -# define re_search(bufp, string, size, startpos, range, regs) \ - __re_search (bufp, string, size, startpos, range, regs) -# define re_compile_pattern(pattern, length, bufp) \ - __re_compile_pattern (pattern, length, bufp) -# define re_set_syntax(syntax) __re_set_syntax (syntax) -# define re_search_2(bufp, st1, s1, st2, s2, startpos, range, regs, stop) \ - __re_search_2 (bufp, st1, s1, st2, s2, startpos, range, regs, stop) -# define re_compile_fastmap(bufp) __re_compile_fastmap (bufp) - -#define btowc __btowc -#endif - -/* This is for other GNU distributions with internationalized messages. */ -#if HAVE_LIBINTL_H || defined _LIBC -# include <libintl.h> -#else -# define gettext(msgid) (msgid) -#endif - -#ifndef gettext_noop -/* This define is so xgettext can find the internationalizable - strings. */ -# define gettext_noop(String) String -#endif - -/* The `emacs' switch turns on certain matching commands - that make sense only in Emacs. */ -#ifdef emacs - -# include "lisp.h" -# include "buffer.h" -# include "syntax.h" - -#else /* not emacs */ - -/* If we are not linking with Emacs proper, - we can't use the relocating allocator - even if config.h says that we can. */ -# undef REL_ALLOC - -# if defined STDC_HEADERS || defined _LIBC -# include <stdlib.h> -# else -char *malloc (); -char *realloc (); -# endif - -/* When used in Emacs's lib-src, we need to get bzero and bcopy somehow. - If nothing else has been done, use the method below. */ -# ifdef INHIBIT_STRING_HEADER -# if !(defined HAVE_BZERO && defined HAVE_BCOPY) -# if !defined bzero && !defined bcopy -# undef INHIBIT_STRING_HEADER -# endif -# endif -# endif - -/* This is the normal way of making sure we have a bcopy and a bzero. - This is used in most programs--a few other programs avoid this - by defining INHIBIT_STRING_HEADER. */ -# ifndef INHIBIT_STRING_HEADER -# if defined HAVE_STRING_H || defined STDC_HEADERS || defined _LIBC -# include <string.h> -# ifndef bzero -# ifndef _LIBC -# define bzero(s, n) (memset (s, '\0', n), (s)) -# else -# define bzero(s, n) __bzero (s, n) -# endif -# endif -# else -# include <strings.h> -# ifndef memcmp -# define memcmp(s1, s2, n) bcmp (s1, s2, n) -# endif -# ifndef memcpy -# define memcpy(d, s, n) (bcopy (s, d, n), (d)) -# endif -# endif -# endif - -/* Define the syntax stuff for \<, \>, etc. */ - -/* This must be nonzero for the wordchar and notwordchar pattern - commands in re_match_2. */ -# ifndef Sword -# define Sword 1 -# endif - -# ifdef SWITCH_ENUM_BUG -# define SWITCH_ENUM_CAST(x) ((int)(x)) -# else -# define SWITCH_ENUM_CAST(x) (x) -# endif - -/* How many characters in the character set. */ -# define CHAR_SET_SIZE 256 - -# ifdef SYNTAX_TABLE - -extern char *re_syntax_table; - -# else /* not SYNTAX_TABLE */ - -static char re_syntax_table[CHAR_SET_SIZE]; - -static void -init_syntax_once () -{ - register int c; - static int done; - - if (done) - return; - - memset (re_syntax_table, 0, sizeof re_syntax_table); - - for (c = 'a'; c <= 'z'; c++) - re_syntax_table[c] = Sword; - - for (c = 'A'; c <= 'Z'; c++) - re_syntax_table[c] = Sword; - - for (c = '0'; c <= '9'; c++) - re_syntax_table[c] = Sword; - - re_syntax_table['_'] = Sword; - - done = 1; -} - -# endif /* not SYNTAX_TABLE */ - -# define SYNTAX(c) re_syntax_table[c] - -#endif /* not emacs */ - -/* Get the interface, including the syntax bits. */ -#include <regex-gnu.h> - -/* isalpha etc. are used for the character classes. */ -#include <ctype.h> - -/* Jim Meyering writes: - - "... Some ctype macros are valid only for character codes that - isascii says are ASCII (SGI's IRIX-4.0.5 is one such system --when - using /bin/cc or gcc but without giving an ansi option). So, all - ctype uses should be through macros like ISPRINT... If - STDC_HEADERS is defined, then autoconf has verified that the ctype - macros don't need to be guarded with references to isascii. ... - Defining isascii to 1 should let any compiler worth its salt - eliminate the && through constant folding." - Solaris defines some of these symbols so we must undefine them first. */ - -#undef ISASCII -#if defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII) -# define ISASCII(c) 1 -#else -# define ISASCII(c) isascii(c) -#endif - -#ifdef isblank -# define ISBLANK(c) (ISASCII (c) && isblank (c)) -#else -# define ISBLANK(c) ((c) == ' ' || (c) == '\t') -#endif -#ifdef isgraph -# define ISGRAPH(c) (ISASCII (c) && isgraph (c)) -#else -# define ISGRAPH(c) (ISASCII (c) && isprint (c) && !isspace (c)) -#endif - -#undef ISPRINT -#define ISPRINT(c) (ISASCII (c) && isprint (c)) -#define ISDIGIT(c) (ISASCII (c) && isdigit (c)) -#define ISALNUM(c) (ISASCII (c) && isalnum (c)) -#define ISALPHA(c) (ISASCII (c) && isalpha (c)) -#define ISCNTRL(c) (ISASCII (c) && iscntrl (c)) -#define ISLOWER(c) (ISASCII (c) && islower (c)) -#define ISPUNCT(c) (ISASCII (c) && ispunct (c)) -#define ISSPACE(c) (ISASCII (c) && isspace (c)) -#define ISUPPER(c) (ISASCII (c) && isupper (c)) -#define ISXDIGIT(c) (ISASCII (c) && isxdigit (c)) - -#ifdef _tolower -# define TOLOWER(c) _tolower(c) -#else -# define TOLOWER(c) tolower(c) -#endif - -#ifndef NULL -# define NULL (void *)0 -#endif - -/* We remove any previous definition of `SIGN_EXTEND_CHAR', - since ours (we hope) works properly with all combinations of - machines, compilers, `char' and `unsigned char' argument types. - (Per Bothner suggested the basic approach.) */ -#undef SIGN_EXTEND_CHAR -#if __STDC__ -# define SIGN_EXTEND_CHAR(c) ((signed char) (c)) -#else /* not __STDC__ */ -/* As in Harbison and Steele. */ -# define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128) -#endif - -/* Should we use malloc or alloca? If REGEX_MALLOC is not defined, we - use `alloca' instead of `malloc'. This is because using malloc in - re_search* or re_match* could cause memory leaks when C-g is used in - Emacs; also, malloc is slower and causes storage fragmentation. On - the other hand, malloc is more portable, and easier to debug. - - Because we sometimes use alloca, some routines have to be macros, - not functions -- `alloca'-allocated space disappears at the end of the - function it is called in. */ - -#ifdef REGEX_MALLOC - -# define REGEX_ALLOCATE malloc -# define REGEX_REALLOCATE(source, osize, nsize) realloc (source, nsize) -# define REGEX_FREE free - -#else /* not REGEX_MALLOC */ - -/* Emacs already defines alloca, sometimes. */ -# ifndef alloca - -/* Make alloca work the best possible way. */ -# ifdef __GNUC__ -# define alloca __builtin_alloca -# else /* not __GNUC__ */ -# if HAVE_ALLOCA_H -# include <alloca.h> -# endif /* HAVE_ALLOCA_H */ -# endif /* not __GNUC__ */ - -# endif /* not alloca */ - -# define REGEX_ALLOCATE alloca - -/* Assumes a `char *destination' variable. */ -# define REGEX_REALLOCATE(source, osize, nsize) \ - (destination = (char *) alloca (nsize), \ - memcpy (destination, source, osize)) - -/* No need to do anything to free, after alloca. */ -# define REGEX_FREE(arg) ((void)0) /* Do nothing! But inhibit gcc warning. */ - -#endif /* not REGEX_MALLOC */ - -/* Define how to allocate the failure stack. */ - -#if defined REL_ALLOC && defined REGEX_MALLOC - -# define REGEX_ALLOCATE_STACK(size) \ - r_alloc (&failure_stack_ptr, (size)) -# define REGEX_REALLOCATE_STACK(source, osize, nsize) \ - r_re_alloc (&failure_stack_ptr, (nsize)) -# define REGEX_FREE_STACK(ptr) \ - r_alloc_free (&failure_stack_ptr) - -#else /* not using relocating allocator */ - -# ifdef REGEX_MALLOC - -# define REGEX_ALLOCATE_STACK malloc -# define REGEX_REALLOCATE_STACK(source, osize, nsize) realloc (source, nsize) -# define REGEX_FREE_STACK free - -# else /* not REGEX_MALLOC */ - -# define REGEX_ALLOCATE_STACK alloca - -# define REGEX_REALLOCATE_STACK(source, osize, nsize) \ - REGEX_REALLOCATE (source, osize, nsize) -/* No need to explicitly free anything. */ -# define REGEX_FREE_STACK(arg) - -# endif /* not REGEX_MALLOC */ -#endif /* not using relocating allocator */ - - -/* True if `size1' is non-NULL and PTR is pointing anywhere inside - `string1' or just past its end. This works if PTR is NULL, which is - a good thing. */ -#define FIRST_STRING_P(ptr) \ - (size1 && string1 <= (ptr) && (ptr) <= string1 + size1) - -/* (Re)Allocate N items of type T using malloc, or fail. */ -#define TALLOC(n, t) ((t *) malloc ((n) * sizeof (t))) -#define RETALLOC(addr, n, t) ((addr) = (t *) realloc (addr, (n) * sizeof (t))) -#define RETALLOC_IF(addr, n, t) \ - if (addr) RETALLOC((addr), (n), t); else (addr) = TALLOC ((n), t) -#define REGEX_TALLOC(n, t) ((t *) REGEX_ALLOCATE ((n) * sizeof (t))) - -#define BYTEWIDTH 8 /* In bits. */ - -#define STREQ(s1, s2) ((strcmp (s1, s2) == 0)) - -#undef MAX -#undef MIN -#define MAX(a, b) ((a) > (b) ? (a) : (b)) -#define MIN(a, b) ((a) < (b) ? (a) : (b)) - -typedef char boolean; -#define false 0 -#define true 1 - -static int re_match_2_internal PARAMS ((struct re_pattern_buffer *bufp, - const char *string1, int size1, - const char *string2, int size2, - int pos, - struct re_registers *regs, - int stop)); - -/* These are the command codes that appear in compiled regular - expressions. Some opcodes are followed by argument bytes. A - command code can specify any interpretation whatsoever for its - arguments. Zero bytes may appear in the compiled regular expression. */ - -typedef enum -{ - no_op = 0, - - /* Succeed right away--no more backtracking. */ - succeed, - - /* Followed by one byte giving n, then by n literal bytes. */ - exactn, - - /* Matches any (more or less) character. */ - anychar, - - /* Matches any one char belonging to specified set. First - following byte is number of bitmap bytes. Then come bytes - for a bitmap saying which chars are in. Bits in each byte - are ordered low-bit-first. A character is in the set if its - bit is 1. A character too large to have a bit in the map is - automatically not in the set. */ - charset, - - /* Same parameters as charset, but match any character that is - not one of those specified. */ - charset_not, - - /* Start remembering the text that is matched, for storing in a - register. Followed by one byte with the register number, in - the range 0 to one less than the pattern buffer's re_nsub - field. Then followed by one byte with the number of groups - inner to this one. (This last has to be part of the - start_memory only because we need it in the on_failure_jump - of re_match_2.) */ - start_memory, - - /* Stop remembering the text that is matched and store it in a - memory register. Followed by one byte with the register - number, in the range 0 to one less than `re_nsub' in the - pattern buffer, and one byte with the number of inner groups, - just like `start_memory'. (We need the number of inner - groups here because we don't have any easy way of finding the - corresponding start_memory when we're at a stop_memory.) */ - stop_memory, - - /* Match a duplicate of something remembered. Followed by one - byte containing the register number. */ - duplicate, - - /* Fail unless at beginning of line. */ - begline, - - /* Fail unless at end of line. */ - endline, - - /* Succeeds if at beginning of buffer (if emacs) or at beginning - of string to be matched (if not). */ - begbuf, - - /* Analogously, for end of buffer/string. */ - endbuf, - - /* Followed by two byte relative address to which to jump. */ - jump, - - /* Same as jump, but marks the end of an alternative. */ - jump_past_alt, - - /* Followed by two-byte relative address of place to resume at - in case of failure. */ - on_failure_jump, - - /* Like on_failure_jump, but pushes a placeholder instead of the - current string position when executed. */ - on_failure_keep_string_jump, - - /* Throw away latest failure point and then jump to following - two-byte relative address. */ - pop_failure_jump, - - /* Change to pop_failure_jump if know won't have to backtrack to - match; otherwise change to jump. This is used to jump - back to the beginning of a repeat. If what follows this jump - clearly won't match what the repeat does, such that we can be - sure that there is no use backtracking out of repetitions - already matched, then we change it to a pop_failure_jump. - Followed by two-byte address. */ - maybe_pop_jump, - - /* Jump to following two-byte address, and push a dummy failure - point. This failure point will be thrown away if an attempt - is made to use it for a failure. A `+' construct makes this - before the first repeat. Also used as an intermediary kind - of jump when compiling an alternative. */ - dummy_failure_jump, - - /* Push a dummy failure point and continue. Used at the end of - alternatives. */ - push_dummy_failure, - - /* Followed by two-byte relative address and two-byte number n. - After matching N times, jump to the address upon failure. */ - succeed_n, - - /* Followed by two-byte relative address, and two-byte number n. - Jump to the address N times, then fail. */ - jump_n, - - /* Set the following two-byte relative address to the - subsequent two-byte number. The address *includes* the two - bytes of number. */ - set_number_at, - - wordchar, /* Matches any word-constituent character. */ - notwordchar, /* Matches any char that is not a word-constituent. */ - - wordbeg, /* Succeeds if at word beginning. */ - wordend, /* Succeeds if at word end. */ - - wordbound, /* Succeeds if at a word boundary. */ - notwordbound /* Succeeds if not at a word boundary. */ - -#ifdef emacs - ,before_dot, /* Succeeds if before point. */ - at_dot, /* Succeeds if at point. */ - after_dot, /* Succeeds if after point. */ - - /* Matches any character whose syntax is specified. Followed by - a byte which contains a syntax code, e.g., Sword. */ - syntaxspec, - - /* Matches any character whose syntax is not that specified. */ - notsyntaxspec -#endif /* emacs */ -} re_opcode_t; - -/* Common operations on the compiled pattern. */ - -/* Store NUMBER in two contiguous bytes starting at DESTINATION. */ - -#define STORE_NUMBER(destination, number) \ - do { \ - (destination)[0] = (number) & 0377; \ - (destination)[1] = (number) >> 8; \ - } while (0) - -/* Same as STORE_NUMBER, except increment DESTINATION to - the byte after where the number is stored. Therefore, DESTINATION - must be an lvalue. */ - -#define STORE_NUMBER_AND_INCR(destination, number) \ - do { \ - STORE_NUMBER (destination, number); \ - (destination) += 2; \ - } while (0) - -/* Put into DESTINATION a number stored in two contiguous bytes starting - at SOURCE. */ - -#define EXTRACT_NUMBER(destination, source) \ - do { \ - (destination) = *(source) & 0377; \ - (destination) += SIGN_EXTEND_CHAR (*((source) + 1)) << 8; \ - } while (0) - -#ifdef DEBUG -static void extract_number _RE_ARGS ((int *dest, unsigned char *source)); -static void -extract_number (dest, source) - int *dest; - unsigned char *source; -{ - int temp = SIGN_EXTEND_CHAR (*(source + 1)); - *dest = *source & 0377; - *dest += temp << 8; -} - -# ifndef EXTRACT_MACROS /* To debug the macros. */ -# undef EXTRACT_NUMBER -# define EXTRACT_NUMBER(dest, src) extract_number (&dest, src) -# endif /* not EXTRACT_MACROS */ - -#endif /* DEBUG */ - -/* Same as EXTRACT_NUMBER, except increment SOURCE to after the number. - SOURCE must be an lvalue. */ - -#define EXTRACT_NUMBER_AND_INCR(destination, source) \ - do { \ - EXTRACT_NUMBER (destination, source); \ - (source) += 2; \ - } while (0) - -#ifdef DEBUG -static void extract_number_and_incr _RE_ARGS ((int *destination, - unsigned char **source)); -static void -extract_number_and_incr (destination, source) - int *destination; - unsigned char **source; -{ - extract_number (destination, *source); - *source += 2; -} - -# ifndef EXTRACT_MACROS -# undef EXTRACT_NUMBER_AND_INCR -# define EXTRACT_NUMBER_AND_INCR(dest, src) \ - extract_number_and_incr (&dest, &src) -# endif /* not EXTRACT_MACROS */ - -#endif /* DEBUG */ - -/* If DEBUG is defined, Regex prints many voluminous messages about what - it is doing (if the variable `debug' is nonzero). If linked with the - main program in `iregex.c', you can enter patterns and strings - interactively. And if linked with the main program in `main.c' and - the other test files, you can run the already-written tests. */ - -#ifdef DEBUG - -/* We use standard I/O for debugging. */ -# include <stdio.h> - -/* It is useful to test things that ``must'' be true when debugging. */ -# include "zassert.h" - -static int debug; - -# define DEBUG_STATEMENT(e) e -# define DEBUG_PRINT1(x) if (debug) printf (x) -# define DEBUG_PRINT2(x1, x2) if (debug) printf (x1, x2) -# define DEBUG_PRINT3(x1, x2, x3) if (debug) printf (x1, x2, x3) -# define DEBUG_PRINT4(x1, x2, x3, x4) if (debug) printf (x1, x2, x3, x4) -# define DEBUG_PRINT_COMPILED_PATTERN(p, s, e) \ - if (debug) print_partial_compiled_pattern (s, e) -# define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2) \ - if (debug) print_double_string (w, s1, sz1, s2, sz2) - - -/* Print the fastmap in human-readable form. */ - -void -print_fastmap (fastmap) - char *fastmap; -{ - unsigned was_a_range = 0; - unsigned i = 0; - - while (i < (1 << BYTEWIDTH)) - { - if (fastmap[i++]) - { - was_a_range = 0; - putchar (i - 1); - while (i < (1 << BYTEWIDTH) && fastmap[i]) - { - was_a_range = 1; - i++; - } - if (was_a_range) - { - printf ("-"); - putchar (i - 1); - } - } - } - putchar ('\n'); -} - - -/* Print a compiled pattern string in human-readable form, starting at - the START pointer into it and ending just before the pointer END. */ - -void -print_partial_compiled_pattern (start, end) - unsigned char *start; - unsigned char *end; -{ - int mcnt, mcnt2; - unsigned char *p1; - unsigned char *p = start; - unsigned char *pend = end; - - if (start == NULL) - { - printf ("(null)\n"); - return; - } - - /* Loop over pattern commands. */ - while (p < pend) - { - printf ("%d:\t", p - start); - - switch ((re_opcode_t) *p++) - { - case no_op: - printf ("/no_op"); - break; - - case exactn: - mcnt = *p++; - printf ("/exactn/%d", mcnt); - do - { - putchar ('/'); - putchar (*p++); - } - while (--mcnt); - break; - - case start_memory: - mcnt = *p++; - printf ("/start_memory/%d/%d", mcnt, *p++); - break; - - case stop_memory: - mcnt = *p++; - printf ("/stop_memory/%d/%d", mcnt, *p++); - break; - - case duplicate: - printf ("/duplicate/%d", *p++); - break; - - case anychar: - printf ("/anychar"); - break; - - case charset: - case charset_not: - { - register int c, last = -100; - register int in_range = 0; - - printf ("/charset [%s", - (re_opcode_t) *(p - 1) == charset_not ? "^" : ""); - - assert (p + *p < pend); - - for (c = 0; c < 256; c++) - if (c / 8 < *p - && (p[1 + (c/8)] & (1 << (c % 8)))) - { - /* Are we starting a range? */ - if (last + 1 == c && ! in_range) - { - putchar ('-'); - in_range = 1; - } - /* Have we broken a range? */ - else if (last + 1 != c && in_range) - { - putchar (last); - in_range = 0; - } - - if (! in_range) - putchar (c); - - last = c; - } - - if (in_range) - putchar (last); - - putchar (']'); - - p += 1 + *p; - } - break; - - case begline: - printf ("/begline"); - break; - - case endline: - printf ("/endline"); - break; - - case on_failure_jump: - extract_number_and_incr (&mcnt, &p); - printf ("/on_failure_jump to %d", p + mcnt - start); - break; - - case on_failure_keep_string_jump: - extract_number_and_incr (&mcnt, &p); - printf ("/on_failure_keep_string_jump to %d", p + mcnt - start); - break; - - case dummy_failure_jump: - extract_number_and_incr (&mcnt, &p); - printf ("/dummy_failure_jump to %d", p + mcnt - start); - break; - - case push_dummy_failure: - printf ("/push_dummy_failure"); - break; - - case maybe_pop_jump: - extract_number_and_incr (&mcnt, &p); - printf ("/maybe_pop_jump to %d", p + mcnt - start); - break; - - case pop_failure_jump: - extract_number_and_incr (&mcnt, &p); - printf ("/pop_failure_jump to %d", p + mcnt - start); - break; - - case jump_past_alt: - extract_number_and_incr (&mcnt, &p); - printf ("/jump_past_alt to %d", p + mcnt - start); - break; - - case jump: - extract_number_and_incr (&mcnt, &p); - printf ("/jump to %d", p + mcnt - start); - break; - - case succeed_n: - extract_number_and_incr (&mcnt, &p); - p1 = p + mcnt; - extract_number_and_incr (&mcnt2, &p); - printf ("/succeed_n to %d, %d times", p1 - start, mcnt2); - break; - - case jump_n: - extract_number_and_incr (&mcnt, &p); - p1 = p + mcnt; - extract_number_and_incr (&mcnt2, &p); - printf ("/jump_n to %d, %d times", p1 - start, mcnt2); - break; - - case set_number_at: - extract_number_and_incr (&mcnt, &p); - p1 = p + mcnt; - extract_number_and_incr (&mcnt2, &p); - printf ("/set_number_at location %d to %d", p1 - start, mcnt2); - break; - - case wordbound: - printf ("/wordbound"); - break; - - case notwordbound: - printf ("/notwordbound"); - break; - - case wordbeg: - printf ("/wordbeg"); - break; - - case wordend: - printf ("/wordend"); - -# ifdef emacs - case before_dot: - printf ("/before_dot"); - break; - - case at_dot: - printf ("/at_dot"); - break; - - case after_dot: - printf ("/after_dot"); - break; - - case syntaxspec: - printf ("/syntaxspec"); - mcnt = *p++; - printf ("/%d", mcnt); - break; - - case notsyntaxspec: - printf ("/notsyntaxspec"); - mcnt = *p++; - printf ("/%d", mcnt); - break; -# endif /* emacs */ - - case wordchar: - printf ("/wordchar"); - break; - - case notwordchar: - printf ("/notwordchar"); - break; - - case begbuf: - printf ("/begbuf"); - break; - - case endbuf: - printf ("/endbuf"); - break; - - default: - printf ("?%d", *(p-1)); - } - - putchar ('\n'); - } - - printf ("%d:\tend of pattern.\n", p - start); -} - - -void -print_compiled_pattern (bufp) - struct re_pattern_buffer *bufp; -{ - unsigned char *buffer = bufp->buffer; - - print_partial_compiled_pattern (buffer, buffer + bufp->used); - printf ("%ld bytes used/%ld bytes allocated.\n", - bufp->used, bufp->allocated); - - if (bufp->fastmap_accurate && bufp->fastmap) - { - printf ("fastmap: "); - print_fastmap (bufp->fastmap); - } - - printf ("re_nsub: %d\t", bufp->re_nsub); - printf ("regs_alloc: %d\t", bufp->regs_allocated); - printf ("can_be_null: %d\t", bufp->can_be_null); - printf ("newline_anchor: %d\n", bufp->newline_anchor); - printf ("no_sub: %d\t", bufp->no_sub); - printf ("not_bol: %d\t", bufp->not_bol); - printf ("not_eol: %d\t", bufp->not_eol); - printf ("syntax: %lx\n", bufp->syntax); - /* Perhaps we should print the translate table? */ -} - - -void -print_double_string (where, string1, size1, string2, size2) - const char *where; - const char *string1; - const char *string2; - int size1; - int size2; -{ - int this_char; - - if (where == NULL) - printf ("(null)"); - else - { - if (FIRST_STRING_P (where)) - { - for (this_char = where - string1; this_char < size1; this_char++) - putchar (string1[this_char]); - - where = string2; - } - - for (this_char = where - string2; this_char < size2; this_char++) - putchar (string2[this_char]); - } -} - -void -printchar (c) - int c; -{ - putc (c, stderr); -} - -#else /* not DEBUG */ - -# undef assert -# define assert(e) - -# define DEBUG_STATEMENT(e) -# define DEBUG_PRINT1(x) -# define DEBUG_PRINT2(x1, x2) -# define DEBUG_PRINT3(x1, x2, x3) -# define DEBUG_PRINT4(x1, x2, x3, x4) -# define DEBUG_PRINT_COMPILED_PATTERN(p, s, e) -# define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2) - -#endif /* not DEBUG */ - -/* Set by `re_set_syntax' to the current regexp syntax to recognize. Can - also be assigned to arbitrarily: each pattern buffer stores its own - syntax, so it can be changed between regex compilations. */ -/* This has no initializer because initialized variables in Emacs - become read-only after dumping. */ -reg_syntax_t re_syntax_options; - - -/* Specify the precise syntax of regexps for compilation. This provides - for compatibility for various utilities which historically have - different, incompatible syntaxes. - - The argument SYNTAX is a bit mask comprised of the various bits - defined in regex.h. We return the old syntax. */ - -reg_syntax_t -re_set_syntax (syntax) - reg_syntax_t syntax; -{ - reg_syntax_t ret = re_syntax_options; - - re_syntax_options = syntax; -#ifdef DEBUG - if (syntax & RE_DEBUG) - debug = 1; - else if (debug) /* was on but now is not */ - debug = 0; -#endif /* DEBUG */ - return ret; -} -#ifdef _LIBC -weak_alias (__re_set_syntax, re_set_syntax) -#endif - -/* This table gives an error message for each of the error codes listed - in regex.h. Obviously the order here has to be same as there. - POSIX doesn't require that we do anything for REG_NOERROR, - but why not be nice? */ - -static const char re_error_msgid[] = - { -#define REG_NOERROR_IDX 0 - gettext_noop ("Success") /* REG_NOERROR */ - "\0" -#define REG_NOMATCH_IDX (REG_NOERROR_IDX + sizeof "Success") - gettext_noop ("No match") /* REG_NOMATCH */ - "\0" -#define REG_BADPAT_IDX (REG_NOMATCH_IDX + sizeof "No match") - gettext_noop ("Invalid regular expression") /* REG_BADPAT */ - "\0" -#define REG_ECOLLATE_IDX (REG_BADPAT_IDX + sizeof "Invalid regular expression") - gettext_noop ("Invalid collation character") /* REG_ECOLLATE */ - "\0" -#define REG_ECTYPE_IDX (REG_ECOLLATE_IDX + sizeof "Invalid collation character") - gettext_noop ("Invalid character class name") /* REG_ECTYPE */ - "\0" -#define REG_EESCAPE_IDX (REG_ECTYPE_IDX + sizeof "Invalid character class name") - gettext_noop ("Trailing backslash") /* REG_EESCAPE */ - "\0" -#define REG_ESUBREG_IDX (REG_EESCAPE_IDX + sizeof "Trailing backslash") - gettext_noop ("Invalid back reference") /* REG_ESUBREG */ - "\0" -#define REG_EBRACK_IDX (REG_ESUBREG_IDX + sizeof "Invalid back reference") - gettext_noop ("Unmatched [ or [^") /* REG_EBRACK */ - "\0" -#define REG_EPAREN_IDX (REG_EBRACK_IDX + sizeof "Unmatched [ or [^") - gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */ - "\0" -#define REG_EBRACE_IDX (REG_EPAREN_IDX + sizeof "Unmatched ( or \\(") - gettext_noop ("Unmatched \\{") /* REG_EBRACE */ - "\0" -#define REG_BADBR_IDX (REG_EBRACE_IDX + sizeof "Unmatched \\{") - gettext_noop ("Invalid content of \\{\\}") /* REG_BADBR */ - "\0" -#define REG_ERANGE_IDX (REG_BADBR_IDX + sizeof "Invalid content of \\{\\}") - gettext_noop ("Invalid range end") /* REG_ERANGE */ - "\0" -#define REG_ESPACE_IDX (REG_ERANGE_IDX + sizeof "Invalid range end") - gettext_noop ("Memory exhausted") /* REG_ESPACE */ - "\0" -#define REG_BADRPT_IDX (REG_ESPACE_IDX + sizeof "Memory exhausted") - gettext_noop ("Invalid preceding regular expression") /* REG_BADRPT */ - "\0" -#define REG_EEND_IDX (REG_BADRPT_IDX + sizeof "Invalid preceding regular expression") - gettext_noop ("Premature end of regular expression") /* REG_EEND */ - "\0" -#define REG_ESIZE_IDX (REG_EEND_IDX + sizeof "Premature end of regular expression") - gettext_noop ("Regular expression too big") /* REG_ESIZE */ - "\0" -#define REG_ERPAREN_IDX (REG_ESIZE_IDX + sizeof "Regular expression too big") - gettext_noop ("Unmatched ) or \\)"), /* REG_ERPAREN */ - }; - -static const size_t re_error_msgid_idx[] = - { - REG_NOERROR_IDX, - REG_NOMATCH_IDX, - REG_BADPAT_IDX, - REG_ECOLLATE_IDX, - REG_ECTYPE_IDX, - REG_EESCAPE_IDX, - REG_ESUBREG_IDX, - REG_EBRACK_IDX, - REG_EPAREN_IDX, - REG_EBRACE_IDX, - REG_BADBR_IDX, - REG_ERANGE_IDX, - REG_ESPACE_IDX, - REG_BADRPT_IDX, - REG_EEND_IDX, - REG_ESIZE_IDX, - REG_ERPAREN_IDX - }; - -/* Avoiding alloca during matching, to placate r_alloc. */ - -/* Define MATCH_MAY_ALLOCATE unless we need to make sure that the - searching and matching functions should not call alloca. On some - systems, alloca is implemented in terms of malloc, and if we're - using the relocating allocator routines, then malloc could cause a - relocation, which might (if the strings being searched are in the - ralloc heap) shift the data out from underneath the regexp - routines. - - Here's another reason to avoid allocation: Emacs - processes input from X in a signal handler; processing X input may - call malloc; if input arrives while a matching routine is calling - malloc, then we're scrod. But Emacs can't just block input while - calling matching routines; then we don't notice interrupts when - they come in. So, Emacs blocks input around all regexp calls - except the matching calls, which it leaves unprotected, in the - faith that they will not malloc. */ - -/* Normally, this is fine. */ -#define MATCH_MAY_ALLOCATE - -/* When using GNU C, we are not REALLY using the C alloca, no matter - what config.h may say. So don't take precautions for it. */ -#ifdef __GNUC__ -# undef C_ALLOCA -#endif - -/* The match routines may not allocate if (1) they would do it with malloc - and (2) it's not safe for them to use malloc. - Note that if REL_ALLOC is defined, matching would not use malloc for the - failure stack, but we would still use it for the register vectors; - so REL_ALLOC should not affect this. */ -#if (defined C_ALLOCA || defined REGEX_MALLOC) && defined emacs -# undef MATCH_MAY_ALLOCATE -#endif - - -/* Failure stack declarations and macros; both re_compile_fastmap and - re_match_2 use a failure stack. These have to be macros because of - REGEX_ALLOCATE_STACK. */ - - -/* Number of failure points for which to initially allocate space - when matching. If this number is exceeded, we allocate more - space, so it is not a hard limit. */ -#ifndef INIT_FAILURE_ALLOC -# define INIT_FAILURE_ALLOC 5 -#endif - -/* Roughly the maximum number of failure points on the stack. Would be - exactly that if always used MAX_FAILURE_ITEMS items each time we failed. - This is a variable only so users of regex can assign to it; we never - change it ourselves. */ - -#ifdef INT_IS_16BIT - -# if defined MATCH_MAY_ALLOCATE -/* 4400 was enough to cause a crash on Alpha OSF/1, - whose default stack limit is 2mb. */ -long int re_max_failures = 4000; -# else -long int re_max_failures = 2000; -# endif - -union fail_stack_elt -{ - unsigned char *pointer; - long int integer; -}; - -typedef union fail_stack_elt fail_stack_elt_t; - -typedef struct -{ - fail_stack_elt_t *stack; - unsigned long int size; - unsigned long int avail; /* Offset of next open position. */ -} fail_stack_type; - -#else /* not INT_IS_16BIT */ - -# if defined MATCH_MAY_ALLOCATE -/* 4400 was enough to cause a crash on Alpha OSF/1, - whose default stack limit is 2mb. */ -int re_max_failures = 20000; -# else -int re_max_failures = 2000; -# endif - -union fail_stack_elt -{ - unsigned char *pointer; - int integer; -}; - -typedef union fail_stack_elt fail_stack_elt_t; - -typedef struct -{ - fail_stack_elt_t *stack; - unsigned size; - unsigned avail; /* Offset of next open position. */ -} fail_stack_type; - -#endif /* INT_IS_16BIT */ - -#define FAIL_STACK_EMPTY() (fail_stack.avail == 0) -#define FAIL_STACK_PTR_EMPTY() (fail_stack_ptr->avail == 0) -#define FAIL_STACK_FULL() (fail_stack.avail == fail_stack.size) - - -/* Define macros to initialize and free the failure stack. - Do `return -2' if the alloc fails. */ - -#ifdef MATCH_MAY_ALLOCATE -# define INIT_FAIL_STACK() \ - do { \ - fail_stack.stack = (fail_stack_elt_t *) \ - REGEX_ALLOCATE_STACK (INIT_FAILURE_ALLOC * sizeof (fail_stack_elt_t)); \ - \ - if (fail_stack.stack == NULL) \ - return -2; \ - \ - fail_stack.size = INIT_FAILURE_ALLOC; \ - fail_stack.avail = 0; \ - } while (0) - -# define RESET_FAIL_STACK() REGEX_FREE_STACK (fail_stack.stack) -#else -# define INIT_FAIL_STACK() \ - do { \ - fail_stack.avail = 0; \ - } while (0) - -# define RESET_FAIL_STACK() -#endif - - -/* Double the size of FAIL_STACK, up to approximately `re_max_failures' items. - - Return 1 if succeeds, and 0 if either ran out of memory - allocating space for it or it was already too large. - - REGEX_REALLOCATE_STACK requires `destination' be declared. */ - -#define DOUBLE_FAIL_STACK(fail_stack) \ - ((fail_stack).size > (unsigned) (re_max_failures * MAX_FAILURE_ITEMS) \ - ? 0 \ - : ((fail_stack).stack = (fail_stack_elt_t *) \ - REGEX_REALLOCATE_STACK ((fail_stack).stack, \ - (fail_stack).size * sizeof (fail_stack_elt_t), \ - ((fail_stack).size << 1) * sizeof (fail_stack_elt_t)), \ - \ - (fail_stack).stack == NULL \ - ? 0 \ - : ((fail_stack).size <<= 1, \ - 1))) - - -/* Push pointer POINTER on FAIL_STACK. - Return 1 if was able to do so and 0 if ran out of memory allocating - space to do so. */ -#define PUSH_PATTERN_OP(POINTER, FAIL_STACK) \ - ((FAIL_STACK_FULL () \ - && !DOUBLE_FAIL_STACK (FAIL_STACK)) \ - ? 0 \ - : ((FAIL_STACK).stack[(FAIL_STACK).avail++].pointer = POINTER, \ - 1)) - -/* Push a pointer value onto the failure stack. - Assumes the variable `fail_stack'. Probably should only - be called from within `PUSH_FAILURE_POINT'. */ -#define PUSH_FAILURE_POINTER(item) \ - fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (item) - -/* This pushes an integer-valued item onto the failure stack. - Assumes the variable `fail_stack'. Probably should only - be called from within `PUSH_FAILURE_POINT'. */ -#define PUSH_FAILURE_INT(item) \ - fail_stack.stack[fail_stack.avail++].integer = (item) - -/* Push a fail_stack_elt_t value onto the failure stack. - Assumes the variable `fail_stack'. Probably should only - be called from within `PUSH_FAILURE_POINT'. */ -#define PUSH_FAILURE_ELT(item) \ - fail_stack.stack[fail_stack.avail++] = (item) - -/* These three POP... operations complement the three PUSH... operations. - All assume that `fail_stack' is nonempty. */ -#define POP_FAILURE_POINTER() fail_stack.stack[--fail_stack.avail].pointer -#define POP_FAILURE_INT() fail_stack.stack[--fail_stack.avail].integer -#define POP_FAILURE_ELT() fail_stack.stack[--fail_stack.avail] - -/* Used to omit pushing failure point id's when we're not debugging. */ -#ifdef DEBUG -# define DEBUG_PUSH PUSH_FAILURE_INT -# define DEBUG_POP(item_addr) *(item_addr) = POP_FAILURE_INT () -#else -# define DEBUG_PUSH(item) -# define DEBUG_POP(item_addr) -#endif - - -/* Push the information about the state we will need - if we ever fail back to it. - - Requires variables fail_stack, regstart, regend, reg_info, and - num_regs_pushed be declared. DOUBLE_FAIL_STACK requires `destination' - be declared. - - Does `return FAILURE_CODE' if runs out of memory. */ - -#define PUSH_FAILURE_POINT(pattern_place, string_place, failure_code) \ - do { \ - char *destination; \ - /* Must be int, so when we don't save any registers, the arithmetic \ - of 0 + -1 isn't done as unsigned. */ \ - /* Can't be int, since there is not a shred of a guarantee that int \ - is wide enough to hold a value of something to which pointer can \ - be assigned */ \ - active_reg_t this_reg; \ - \ - DEBUG_STATEMENT (failure_id++); \ - DEBUG_STATEMENT (nfailure_points_pushed++); \ - DEBUG_PRINT2 ("\nPUSH_FAILURE_POINT #%u:\n", failure_id); \ - DEBUG_PRINT2 (" Before push, next avail: %d\n", (fail_stack).avail);\ - DEBUG_PRINT2 (" size: %d\n", (fail_stack).size);\ - \ - DEBUG_PRINT2 (" slots needed: %ld\n", NUM_FAILURE_ITEMS); \ - DEBUG_PRINT2 (" available: %d\n", REMAINING_AVAIL_SLOTS); \ - \ - /* Ensure we have enough space allocated for what we will push. */ \ - while (REMAINING_AVAIL_SLOTS < NUM_FAILURE_ITEMS) \ - { \ - if (!DOUBLE_FAIL_STACK (fail_stack)) \ - return failure_code; \ - \ - DEBUG_PRINT2 ("\n Doubled stack; size now: %d\n", \ - (fail_stack).size); \ - DEBUG_PRINT2 (" slots available: %d\n", REMAINING_AVAIL_SLOTS);\ - } \ - \ - /* Push the info, starting with the registers. */ \ - DEBUG_PRINT1 ("\n"); \ - \ - if (1) \ - for (this_reg = lowest_active_reg; this_reg <= highest_active_reg; \ - this_reg++) \ - { \ - DEBUG_PRINT2 (" Pushing reg: %lu\n", this_reg); \ - DEBUG_STATEMENT (num_regs_pushed++); \ - \ - DEBUG_PRINT2 (" start: %p\n", regstart[this_reg]); \ - PUSH_FAILURE_POINTER (regstart[this_reg]); \ - \ - DEBUG_PRINT2 (" end: %p\n", regend[this_reg]); \ - PUSH_FAILURE_POINTER (regend[this_reg]); \ - \ - DEBUG_PRINT2 (" info: %p\n ", \ - reg_info[this_reg].word.pointer); \ - DEBUG_PRINT2 (" match_null=%d", \ - REG_MATCH_NULL_STRING_P (reg_info[this_reg])); \ - DEBUG_PRINT2 (" active=%d", IS_ACTIVE (reg_info[this_reg])); \ - DEBUG_PRINT2 (" matched_something=%d", \ - MATCHED_SOMETHING (reg_info[this_reg])); \ - DEBUG_PRINT2 (" ever_matched=%d", \ - EVER_MATCHED_SOMETHING (reg_info[this_reg])); \ - DEBUG_PRINT1 ("\n"); \ - PUSH_FAILURE_ELT (reg_info[this_reg].word); \ - } \ - \ - DEBUG_PRINT2 (" Pushing low active reg: %ld\n", lowest_active_reg);\ - PUSH_FAILURE_INT (lowest_active_reg); \ - \ - DEBUG_PRINT2 (" Pushing high active reg: %ld\n", highest_active_reg);\ - PUSH_FAILURE_INT (highest_active_reg); \ - \ - DEBUG_PRINT2 (" Pushing pattern %p:\n", pattern_place); \ - DEBUG_PRINT_COMPILED_PATTERN (bufp, pattern_place, pend); \ - PUSH_FAILURE_POINTER (pattern_place); \ - \ - DEBUG_PRINT2 (" Pushing string %p: `", string_place); \ - DEBUG_PRINT_DOUBLE_STRING (string_place, string1, size1, string2, \ - size2); \ - DEBUG_PRINT1 ("'\n"); \ - PUSH_FAILURE_POINTER (string_place); \ - \ - DEBUG_PRINT2 (" Pushing failure id: %u\n", failure_id); \ - DEBUG_PUSH (failure_id); \ - } while (0) - -/* This is the number of items that are pushed and popped on the stack - for each register. */ -#define NUM_REG_ITEMS 3 - -/* Individual items aside from the registers. */ -#ifdef DEBUG -# define NUM_NONREG_ITEMS 5 /* Includes failure point id. */ -#else -# define NUM_NONREG_ITEMS 4 -#endif - -/* We push at most this many items on the stack. */ -/* We used to use (num_regs - 1), which is the number of registers - this regexp will save; but that was changed to 5 - to avoid stack overflow for a regexp with lots of parens. */ -#define MAX_FAILURE_ITEMS (5 * NUM_REG_ITEMS + NUM_NONREG_ITEMS) - -/* We actually push this many items. */ -#define NUM_FAILURE_ITEMS \ - (((0 \ - ? 0 : highest_active_reg - lowest_active_reg + 1) \ - * NUM_REG_ITEMS) \ - + NUM_NONREG_ITEMS) - -/* How many items can still be added to the stack without overflowing it. */ -#define REMAINING_AVAIL_SLOTS ((fail_stack).size - (fail_stack).avail) - - -/* Pops what PUSH_FAIL_STACK pushes. - - We restore into the parameters, all of which should be lvalues: - STR -- the saved data position. - PAT -- the saved pattern position. - LOW_REG, HIGH_REG -- the highest and lowest active registers. - REGSTART, REGEND -- arrays of string positions. - REG_INFO -- array of information about each subexpression. - - Also assumes the variables `fail_stack' and (if debugging), `bufp', - `pend', `string1', `size1', `string2', and `size2'. */ - -#define POP_FAILURE_POINT(str, pat, low_reg, high_reg, regstart, regend, reg_info)\ -{ \ - DEBUG_STATEMENT (unsigned failure_id;) \ - active_reg_t this_reg; \ - const unsigned char *string_temp; \ - \ - assert (!FAIL_STACK_EMPTY ()); \ - \ - /* Remove failure points and point to how many regs pushed. */ \ - DEBUG_PRINT1 ("POP_FAILURE_POINT:\n"); \ - DEBUG_PRINT2 (" Before pop, next avail: %d\n", fail_stack.avail); \ - DEBUG_PRINT2 (" size: %d\n", fail_stack.size); \ - \ - assert (fail_stack.avail >= NUM_NONREG_ITEMS); \ - \ - DEBUG_POP (&failure_id); \ - DEBUG_PRINT2 (" Popping failure id: %u\n", failure_id); \ - \ - /* If the saved string location is NULL, it came from an \ - on_failure_keep_string_jump opcode, and we want to throw away the \ - saved NULL, thus retaining our current position in the string. */ \ - string_temp = POP_FAILURE_POINTER (); \ - if (string_temp != NULL) \ - str = (const char *) string_temp; \ - \ - DEBUG_PRINT2 (" Popping string %p: `", str); \ - DEBUG_PRINT_DOUBLE_STRING (str, string1, size1, string2, size2); \ - DEBUG_PRINT1 ("'\n"); \ - \ - pat = (unsigned char *) POP_FAILURE_POINTER (); \ - DEBUG_PRINT2 (" Popping pattern %p:\n", pat); \ - DEBUG_PRINT_COMPILED_PATTERN (bufp, pat, pend); \ - \ - /* Restore register info. */ \ - high_reg = (active_reg_t) POP_FAILURE_INT (); \ - DEBUG_PRINT2 (" Popping high active reg: %ld\n", high_reg); \ - \ - low_reg = (active_reg_t) POP_FAILURE_INT (); \ - DEBUG_PRINT2 (" Popping low active reg: %ld\n", low_reg); \ - \ - if (1) \ - for (this_reg = high_reg; this_reg >= low_reg; this_reg--) \ - { \ - DEBUG_PRINT2 (" Popping reg: %ld\n", this_reg); \ - \ - reg_info[this_reg].word = POP_FAILURE_ELT (); \ - DEBUG_PRINT2 (" info: %p\n", \ - reg_info[this_reg].word.pointer); \ - \ - regend[this_reg] = (const char *) POP_FAILURE_POINTER (); \ - DEBUG_PRINT2 (" end: %p\n", regend[this_reg]); \ - \ - regstart[this_reg] = (const char *) POP_FAILURE_POINTER (); \ - DEBUG_PRINT2 (" start: %p\n", regstart[this_reg]); \ - } \ - else \ - { \ - for (this_reg = highest_active_reg; this_reg > high_reg; this_reg--) \ - { \ - reg_info[this_reg].word.integer = 0; \ - regend[this_reg] = 0; \ - regstart[this_reg] = 0; \ - } \ - highest_active_reg = high_reg; \ - } \ - \ - set_regs_matched_done = 0; \ - DEBUG_STATEMENT (nfailure_points_popped++); \ -} /* POP_FAILURE_POINT */ - - - -/* Structure for per-register (a.k.a. per-group) information. - Other register information, such as the - starting and ending positions (which are addresses), and the list of - inner groups (which is a bits list) are maintained in separate - variables. - - We are making a (strictly speaking) nonportable assumption here: that - the compiler will pack our bit fields into something that fits into - the type of `word', i.e., is something that fits into one item on the - failure stack. */ - - -/* Declarations and macros for re_match_2. */ - -typedef union -{ - fail_stack_elt_t word; - struct - { - /* This field is one if this group can match the empty string, - zero if not. If not yet determined, `MATCH_NULL_UNSET_VALUE'. */ -#define MATCH_NULL_UNSET_VALUE 3 - unsigned match_null_string_p : 2; - unsigned is_active : 1; - unsigned matched_something : 1; - unsigned ever_matched_something : 1; - } bits; -} register_info_type; - -#define REG_MATCH_NULL_STRING_P(R) ((R).bits.match_null_string_p) -#define IS_ACTIVE(R) ((R).bits.is_active) -#define MATCHED_SOMETHING(R) ((R).bits.matched_something) -#define EVER_MATCHED_SOMETHING(R) ((R).bits.ever_matched_something) - - -/* Call this when have matched a real character; it sets `matched' flags - for the subexpressions which we are currently inside. Also records - that those subexprs have matched. */ -#define SET_REGS_MATCHED() \ - do \ - { \ - if (!set_regs_matched_done) \ - { \ - active_reg_t r; \ - set_regs_matched_done = 1; \ - for (r = lowest_active_reg; r <= highest_active_reg; r++) \ - { \ - MATCHED_SOMETHING (reg_info[r]) \ - = EVER_MATCHED_SOMETHING (reg_info[r]) \ - = 1; \ - } \ - } \ - } \ - while (0) - -/* Registers are set to a sentinel when they haven't yet matched. */ -static char reg_unset_dummy; -#define REG_UNSET_VALUE (®_unset_dummy) -#define REG_UNSET(e) ((e) == REG_UNSET_VALUE) - -/* Subroutine declarations and macros for regex_compile. */ - -static reg_errcode_t regex_compile _RE_ARGS ((const char *pattern, size_t size, - reg_syntax_t syntax, - struct re_pattern_buffer *bufp)); -static void store_op1 _RE_ARGS ((re_opcode_t op, unsigned char *loc, int arg)); -static void store_op2 _RE_ARGS ((re_opcode_t op, unsigned char *loc, - int arg1, int arg2)); -static void insert_op1 _RE_ARGS ((re_opcode_t op, unsigned char *loc, - int arg, unsigned char *end)); -static void insert_op2 _RE_ARGS ((re_opcode_t op, unsigned char *loc, - int arg1, int arg2, unsigned char *end)); -static boolean at_begline_loc_p _RE_ARGS ((const char *pattern, const char *p, - reg_syntax_t syntax)); -static boolean at_endline_loc_p _RE_ARGS ((const char *p, const char *pend, - reg_syntax_t syntax)); -static reg_errcode_t compile_range _RE_ARGS ((const char **p_ptr, - const char *pend, - char *translate, - reg_syntax_t syntax, - unsigned char *b)); - -/* Fetch the next character in the uncompiled pattern---translating it - if necessary. Also cast from a signed character in the constant - string passed to us by the user to an unsigned char that we can use - as an array index (in, e.g., `translate'). */ -#ifndef PATFETCH -# define PATFETCH(c) \ - do {if (p == pend) return REG_EEND; \ - c = (unsigned char) *p++; \ - if (translate) c = (unsigned char) translate[c]; \ - } while (0) -#endif - -/* Fetch the next character in the uncompiled pattern, with no - translation. */ -#define PATFETCH_RAW(c) \ - do {if (p == pend) return REG_EEND; \ - c = (unsigned char) *p++; \ - } while (0) - -/* Go backwards one character in the pattern. */ -#define PATUNFETCH p-- - - -/* If `translate' is non-null, return translate[D], else just D. We - cast the subscript to translate because some data is declared as - `char *', to avoid warnings when a string constant is passed. But - when we use a character as a subscript we must make it unsigned. */ -#ifndef TRANSLATE -# define TRANSLATE(d) \ - (translate ? (char) translate[(unsigned char) (d)] : (d)) -#endif - - -/* Macros for outputting the compiled pattern into `buffer'. */ - -/* If the buffer isn't allocated when it comes in, use this. */ -#define INIT_BUF_SIZE 32 - -/* Make sure we have at least N more bytes of space in buffer. */ -#define GET_BUFFER_SPACE(n) \ - while ((unsigned long) (b - bufp->buffer + (n)) > bufp->allocated) \ - EXTEND_BUFFER () - -/* Make sure we have one more byte of buffer space and then add C to it. */ -#define BUF_PUSH(c) \ - do { \ - GET_BUFFER_SPACE (1); \ - *b++ = (unsigned char) (c); \ - } while (0) - - -/* Ensure we have two more bytes of buffer space and then append C1 and C2. */ -#define BUF_PUSH_2(c1, c2) \ - do { \ - GET_BUFFER_SPACE (2); \ - *b++ = (unsigned char) (c1); \ - *b++ = (unsigned char) (c2); \ - } while (0) - - -/* As with BUF_PUSH_2, except for three bytes. */ -#define BUF_PUSH_3(c1, c2, c3) \ - do { \ - GET_BUFFER_SPACE (3); \ - *b++ = (unsigned char) (c1); \ - *b++ = (unsigned char) (c2); \ - *b++ = (unsigned char) (c3); \ - } while (0) - - -/* Store a jump with opcode OP at LOC to location TO. We store a - relative address offset by the three bytes the jump itself occupies. */ -#define STORE_JUMP(op, loc, to) \ - store_op1 (op, loc, (int) ((to) - (loc) - 3)) - -/* Likewise, for a two-argument jump. */ -#define STORE_JUMP2(op, loc, to, arg) \ - store_op2 (op, loc, (int) ((to) - (loc) - 3), arg) - -/* Like `STORE_JUMP', but for inserting. Assume `b' is the buffer end. */ -#define INSERT_JUMP(op, loc, to) \ - insert_op1 (op, loc, (int) ((to) - (loc) - 3), b) - -/* Like `STORE_JUMP2', but for inserting. Assume `b' is the buffer end. */ -#define INSERT_JUMP2(op, loc, to, arg) \ - insert_op2 (op, loc, (int) ((to) - (loc) - 3), arg, b) - - -/* This is not an arbitrary limit: the arguments which represent offsets - into the pattern are two bytes long. So if 2^16 bytes turns out to - be too small, many things would have to change. */ -/* Any other compiler which, like MSC, has allocation limit below 2^16 - bytes will have to use approach similar to what was done below for - MSC and drop MAX_BUF_SIZE a bit. Otherwise you may end up - reallocating to 0 bytes. Such thing is not going to work too well. - You have been warned!! */ -#if defined _MSC_VER && !defined _WIN32 -/* Microsoft C 16-bit versions limit malloc to approx 65512 bytes. - The REALLOC define eliminates a flurry of conversion warnings, - but is not required. */ -# define MAX_BUF_SIZE 65500L -# define REALLOC(p,s) realloc ((p), (size_t) (s)) -#else -# define MAX_BUF_SIZE (1L << 16) -# define REALLOC(p,s) realloc ((p), (s)) -#endif - -/* Extend the buffer by twice its current size via realloc and - reset the pointers that pointed into the old block to point to the - correct places in the new one. If extending the buffer results in it - being larger than MAX_BUF_SIZE, then flag memory exhausted. */ -#define EXTEND_BUFFER() \ - do { \ - unsigned char *old_buffer = bufp->buffer; \ - if (bufp->allocated == MAX_BUF_SIZE) \ - return REG_ESIZE; \ - bufp->allocated <<= 1; \ - if (bufp->allocated > MAX_BUF_SIZE) \ - bufp->allocated = MAX_BUF_SIZE; \ - bufp->buffer = (unsigned char *) REALLOC (bufp->buffer, bufp->allocated);\ - if (bufp->buffer == NULL) \ - return REG_ESPACE; \ - /* If the buffer moved, move all the pointers into it. */ \ - if (old_buffer != bufp->buffer) \ - { \ - b = (b - old_buffer) + bufp->buffer; \ - begalt = (begalt - old_buffer) + bufp->buffer; \ - if (fixup_alt_jump) \ - fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer;\ - if (laststart) \ - laststart = (laststart - old_buffer) + bufp->buffer; \ - if (pending_exact) \ - pending_exact = (pending_exact - old_buffer) + bufp->buffer; \ - } \ - } while (0) - - -/* Since we have one byte reserved for the register number argument to - {start,stop}_memory, the maximum number of groups we can report - things about is what fits in that byte. */ -#define MAX_REGNUM 255 - -/* But patterns can have more than `MAX_REGNUM' registers. We just - ignore the excess. */ -typedef unsigned regnum_t; - - -/* Macros for the compile stack. */ - -/* Since offsets can go either forwards or backwards, this type needs to - be able to hold values from -(MAX_BUF_SIZE - 1) to MAX_BUF_SIZE - 1. */ -/* int may be not enough when sizeof(int) == 2. */ -typedef long pattern_offset_t; - -typedef struct -{ - pattern_offset_t begalt_offset; - pattern_offset_t fixup_alt_jump; - pattern_offset_t inner_group_offset; - pattern_offset_t laststart_offset; - regnum_t regnum; -} compile_stack_elt_t; - - -typedef struct -{ - compile_stack_elt_t *stack; - unsigned size; - unsigned avail; /* Offset of next open position. */ -} compile_stack_type; - - -#define INIT_COMPILE_STACK_SIZE 32 - -#define COMPILE_STACK_EMPTY (compile_stack.avail == 0) -#define COMPILE_STACK_FULL (compile_stack.avail == compile_stack.size) - -/* The next available element. */ -#define COMPILE_STACK_TOP (compile_stack.stack[compile_stack.avail]) - - -/* Set the bit for character C in a list. */ -#define SET_LIST_BIT(c) \ - (b[((unsigned char) (c)) / BYTEWIDTH] \ - |= 1 << (((unsigned char) c) % BYTEWIDTH)) - - -/* Get the next unsigned number in the uncompiled pattern. */ -#define GET_UNSIGNED_NUMBER(num) \ - { if (p != pend) \ - { \ - PATFETCH (c); \ - while (ISDIGIT (c)) \ - { \ - if (num < 0) \ - num = 0; \ - num = num * 10 + c - '0'; \ - if (p == pend) \ - break; \ - PATFETCH (c); \ - } \ - } \ - } - -#if defined _LIBC || WIDE_CHAR_SUPPORT -/* The GNU C library provides support for user-defined character classes - and the functions from ISO C amendement 1. */ -# ifdef CHARCLASS_NAME_MAX -# define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX -# else -/* This shouldn't happen but some implementation might still have this - problem. Use a reasonable default value. */ -# define CHAR_CLASS_MAX_LENGTH 256 -# endif - -# ifdef _LIBC -# define IS_CHAR_CLASS(string) __wctype (string) -# else -# define IS_CHAR_CLASS(string) wctype (string) -# endif -#else -# define CHAR_CLASS_MAX_LENGTH 6 /* Namely, `xdigit'. */ - -# define IS_CHAR_CLASS(string) \ - (STREQ (string, "alpha") || STREQ (string, "upper") \ - || STREQ (string, "lower") || STREQ (string, "digit") \ - || STREQ (string, "alnum") || STREQ (string, "xdigit") \ - || STREQ (string, "space") || STREQ (string, "print") \ - || STREQ (string, "punct") || STREQ (string, "graph") \ - || STREQ (string, "cntrl") || STREQ (string, "blank")) -#endif - -#ifndef MATCH_MAY_ALLOCATE - -/* If we cannot allocate large objects within re_match_2_internal, - we make the fail stack and register vectors global. - The fail stack, we grow to the maximum size when a regexp - is compiled. - The register vectors, we adjust in size each time we - compile a regexp, according to the number of registers it needs. */ - -static fail_stack_type fail_stack; - -/* Size with which the following vectors are currently allocated. - That is so we can make them bigger as needed, - but never make them smaller. */ -static int regs_allocated_size; - -static const char ** regstart, ** regend; -static const char ** old_regstart, ** old_regend; -static const char **best_regstart, **best_regend; -static register_info_type *reg_info; -static const char **reg_dummy; -static register_info_type *reg_info_dummy; - -/* Make the register vectors big enough for NUM_REGS registers, - but don't make them smaller. */ - -static -regex_grow_registers (num_regs) - int num_regs; -{ - if (num_regs > regs_allocated_size) - { - RETALLOC_IF (regstart, num_regs, const char *); - RETALLOC_IF (regend, num_regs, const char *); - RETALLOC_IF (old_regstart, num_regs, const char *); - RETALLOC_IF (old_regend, num_regs, const char *); - RETALLOC_IF (best_regstart, num_regs, const char *); - RETALLOC_IF (best_regend, num_regs, const char *); - RETALLOC_IF (reg_info, num_regs, register_info_type); - RETALLOC_IF (reg_dummy, num_regs, const char *); - RETALLOC_IF (reg_info_dummy, num_regs, register_info_type); - - regs_allocated_size = num_regs; - } -} - -#endif /* not MATCH_MAY_ALLOCATE */ - -static boolean group_in_compile_stack _RE_ARGS ((compile_stack_type - compile_stack, - regnum_t regnum)); - -/* `regex_compile' compiles PATTERN (of length SIZE) according to SYNTAX. - Returns one of error codes defined in `regex.h', or zero for success. - - Assumes the `allocated' (and perhaps `buffer') and `translate' - fields are set in BUFP on entry. - - If it succeeds, results are put in BUFP (if it returns an error, the - contents of BUFP are undefined): - `buffer' is the compiled pattern; - `syntax' is set to SYNTAX; - `used' is set to the length of the compiled pattern; - `fastmap_accurate' is zero; - `re_nsub' is the number of subexpressions in PATTERN; - `not_bol' and `not_eol' are zero; - - The `fastmap' and `newline_anchor' fields are neither - examined nor set. */ - -/* Return, freeing storage we allocated. */ -#define FREE_STACK_RETURN(value) \ - return (free (compile_stack.stack), value) - -static reg_errcode_t -regex_compile (pattern, size, syntax, bufp) - const char *pattern; - size_t size; - reg_syntax_t syntax; - struct re_pattern_buffer *bufp; -{ - /* We fetch characters from PATTERN here. Even though PATTERN is - `char *' (i.e., signed), we declare these variables as unsigned, so - they can be reliably used as array indices. */ - register unsigned char c, c1; - - /* A random temporary spot in PATTERN. */ - const char *p1; - - /* Points to the end of the buffer, where we should append. */ - register unsigned char *b; - - /* Keeps track of unclosed groups. */ - compile_stack_type compile_stack; - - /* Points to the current (ending) position in the pattern. */ - const char *p = pattern; - const char *pend = pattern + size; - - /* How to translate the characters in the pattern. */ - RE_TRANSLATE_TYPE translate = bufp->translate; - - /* Address of the count-byte of the most recently inserted `exactn' - command. This makes it possible to tell if a new exact-match - character can be added to that command or if the character requires - a new `exactn' command. */ - unsigned char *pending_exact = 0; - - /* Address of start of the most recently finished expression. - This tells, e.g., postfix * where to find the start of its - operand. Reset at the beginning of groups and alternatives. */ - unsigned char *laststart = 0; - - /* Address of beginning of regexp, or inside of last group. */ - unsigned char *begalt; - - /* Place in the uncompiled pattern (i.e., the {) to - which to go back if the interval is invalid. */ - const char *beg_interval; - - /* Address of the place where a forward jump should go to the end of - the containing expression. Each alternative of an `or' -- except the - last -- ends with a forward jump of this sort. */ - unsigned char *fixup_alt_jump = 0; - - /* Counts open-groups as they are encountered. Remembered for the - matching close-group on the compile stack, so the same register - number is put in the stop_memory as the start_memory. */ - regnum_t regnum = 0; - -#ifdef DEBUG - DEBUG_PRINT1 ("\nCompiling pattern: "); - if (debug) - { - unsigned debug_count; - - for (debug_count = 0; debug_count < size; debug_count++) - putchar (pattern[debug_count]); - putchar ('\n'); - } -#endif /* DEBUG */ - - /* Initialize the compile stack. */ - compile_stack.stack = TALLOC (INIT_COMPILE_STACK_SIZE, compile_stack_elt_t); - if (compile_stack.stack == NULL) - return REG_ESPACE; - - compile_stack.size = INIT_COMPILE_STACK_SIZE; - compile_stack.avail = 0; - - /* Initialize the pattern buffer. */ - bufp->syntax = syntax; - bufp->fastmap_accurate = 0; - bufp->not_bol = bufp->not_eol = 0; - - /* Set `used' to zero, so that if we return an error, the pattern - printer (for debugging) will think there's no pattern. We reset it - at the end. */ - bufp->used = 0; - - /* Always count groups, whether or not bufp->no_sub is set. */ - bufp->re_nsub = 0; - -#if !defined emacs && !defined SYNTAX_TABLE - /* Initialize the syntax table. */ - init_syntax_once (); -#endif - - if (bufp->allocated == 0) - { - if (bufp->buffer) - { /* If zero allocated, but buffer is non-null, try to realloc - enough space. This loses if buffer's address is bogus, but - that is the user's responsibility. */ - RETALLOC (bufp->buffer, INIT_BUF_SIZE, unsigned char); - } - else - { /* Caller did not allocate a buffer. Do it for them. */ - bufp->buffer = TALLOC (INIT_BUF_SIZE, unsigned char); - } - if (!bufp->buffer) FREE_STACK_RETURN (REG_ESPACE); - - bufp->allocated = INIT_BUF_SIZE; - } - - begalt = b = bufp->buffer; - - /* Loop through the uncompiled pattern until we're at the end. */ - while (p != pend) - { - PATFETCH (c); - - switch (c) - { - case '^': - { - if ( /* If at start of pattern, it's an operator. */ - p == pattern + 1 - /* If context independent, it's an operator. */ - || syntax & RE_CONTEXT_INDEP_ANCHORS - /* Otherwise, depends on what's come before. */ - || at_begline_loc_p (pattern, p, syntax)) - BUF_PUSH (begline); - else - goto normal_char; - } - break; - - - case '$': - { - if ( /* If at end of pattern, it's an operator. */ - p == pend - /* If context independent, it's an operator. */ - || syntax & RE_CONTEXT_INDEP_ANCHORS - /* Otherwise, depends on what's next. */ - || at_endline_loc_p (p, pend, syntax)) - BUF_PUSH (endline); - else - goto normal_char; - } - break; - - - case '+': - case '?': - if ((syntax & RE_BK_PLUS_QM) - || (syntax & RE_LIMITED_OPS)) - goto normal_char; - handle_plus: - case '*': - /* If there is no previous pattern... */ - if (!laststart) - { - if (syntax & RE_CONTEXT_INVALID_OPS) - FREE_STACK_RETURN (REG_BADRPT); - else if (!(syntax & RE_CONTEXT_INDEP_OPS)) - goto normal_char; - } - - { - /* Are we optimizing this jump? */ - boolean keep_string_p = false; - - /* 1 means zero (many) matches is allowed. */ - char zero_times_ok = 0, many_times_ok = 0; - - /* If there is a sequence of repetition chars, collapse it - down to just one (the right one). We can't combine - interval operators with these because of, e.g., `a{2}*', - which should only match an even number of `a's. */ - - for (;;) - { - zero_times_ok |= c != '+'; - many_times_ok |= c != '?'; - - if (p == pend) - break; - - PATFETCH (c); - - if (c == '*' - || (!(syntax & RE_BK_PLUS_QM) && (c == '+' || c == '?'))) - ; - - else if (syntax & RE_BK_PLUS_QM && c == '\\') - { - if (p == pend) FREE_STACK_RETURN (REG_EESCAPE); - - PATFETCH (c1); - if (!(c1 == '+' || c1 == '?')) - { - PATUNFETCH; - PATUNFETCH; - break; - } - - c = c1; - } - else - { - PATUNFETCH; - break; - } - - /* If we get here, we found another repeat character. */ - } - - /* Star, etc. applied to an empty pattern is equivalent - to an empty pattern. */ - if (!laststart) - break; - - /* Now we know whether or not zero matches is allowed - and also whether or not two or more matches is allowed. */ - if (many_times_ok) - { /* More than one repetition is allowed, so put in at the - end a backward relative jump from `b' to before the next - jump we're going to put in below (which jumps from - laststart to after this jump). - - But if we are at the `*' in the exact sequence `.*\n', - insert an unconditional jump backwards to the ., - instead of the beginning of the loop. This way we only - push a failure point once, instead of every time - through the loop. */ - assert (p - 1 > pattern); - - /* Allocate the space for the jump. */ - GET_BUFFER_SPACE (3); - - /* We know we are not at the first character of the pattern, - because laststart was nonzero. And we've already - incremented `p', by the way, to be the character after - the `*'. Do we have to do something analogous here - for null bytes, because of RE_DOT_NOT_NULL? */ - if (TRANSLATE (*(p - 2)) == TRANSLATE ('.') - && zero_times_ok - && p < pend && TRANSLATE (*p) == TRANSLATE ('\n') - && !(syntax & RE_DOT_NEWLINE)) - { /* We have .*\n. */ - STORE_JUMP (jump, b, laststart); - keep_string_p = true; - } - else - /* Anything else. */ - STORE_JUMP (maybe_pop_jump, b, laststart - 3); - - /* We've added more stuff to the buffer. */ - b += 3; - } - - /* On failure, jump from laststart to b + 3, which will be the - end of the buffer after this jump is inserted. */ - GET_BUFFER_SPACE (3); - INSERT_JUMP (keep_string_p ? on_failure_keep_string_jump - : on_failure_jump, - laststart, b + 3); - pending_exact = 0; - b += 3; - - if (!zero_times_ok) - { - /* At least one repetition is required, so insert a - `dummy_failure_jump' before the initial - `on_failure_jump' instruction of the loop. This - effects a skip over that instruction the first time - we hit that loop. */ - GET_BUFFER_SPACE (3); - INSERT_JUMP (dummy_failure_jump, laststart, laststart + 6); - b += 3; - } - } - break; - - - case '.': - laststart = b; - BUF_PUSH (anychar); - break; - - - case '[': - { - boolean had_char_class = false; - - if (p == pend) FREE_STACK_RETURN (REG_EBRACK); - - /* Ensure that we have enough space to push a charset: the - opcode, the length count, and the bitset; 34 bytes in all. */ - GET_BUFFER_SPACE (34); - - laststart = b; - - /* We test `*p == '^' twice, instead of using an if - statement, so we only need one BUF_PUSH. */ - BUF_PUSH (*p == '^' ? charset_not : charset); - if (*p == '^') - p++; - - /* Remember the first position in the bracket expression. */ - p1 = p; - - /* Push the number of bytes in the bitmap. */ - BUF_PUSH ((1 << BYTEWIDTH) / BYTEWIDTH); - - /* Clear the whole map. */ - memset (b, 0, (1 << BYTEWIDTH) / BYTEWIDTH); - - /* charset_not matches newline according to a syntax bit. */ - if ((re_opcode_t) b[-2] == charset_not - && (syntax & RE_HAT_LISTS_NOT_NEWLINE)) - SET_LIST_BIT ('\n'); - - /* Read in characters and ranges, setting map bits. */ - for (;;) - { - if (p == pend) FREE_STACK_RETURN (REG_EBRACK); - - PATFETCH (c); - - /* \ might escape characters inside [...] and [^...]. */ - if ((syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) && c == '\\') - { - if (p == pend) FREE_STACK_RETURN (REG_EESCAPE); - - PATFETCH (c1); - SET_LIST_BIT (c1); - continue; - } - - /* Could be the end of the bracket expression. If it's - not (i.e., when the bracket expression is `[]' so - far), the ']' character bit gets set way below. */ - if (c == ']' && p != p1 + 1) - break; - - /* Look ahead to see if it's a range when the last thing - was a character class. */ - if (had_char_class && c == '-' && *p != ']') - FREE_STACK_RETURN (REG_ERANGE); - - /* Look ahead to see if it's a range when the last thing - was a character: if this is a hyphen not at the - beginning or the end of a list, then it's the range - operator. */ - if (c == '-' - && !(p - 2 >= pattern && p[-2] == '[') - && !(p - 3 >= pattern && p[-3] == '[' && p[-2] == '^') - && *p != ']') - { - reg_errcode_t ret - = compile_range (&p, pend, translate, syntax, b); - if (ret != REG_NOERROR) FREE_STACK_RETURN (ret); - } - - else if (p[0] == '-' && p[1] != ']') - { /* This handles ranges made up of characters only. */ - reg_errcode_t ret; - - /* Move past the `-'. */ - PATFETCH (c1); - - ret = compile_range (&p, pend, translate, syntax, b); - if (ret != REG_NOERROR) FREE_STACK_RETURN (ret); - } - - /* See if we're at the beginning of a possible character - class. */ - - else if (syntax & RE_CHAR_CLASSES && c == '[' && *p == ':') - { /* Leave room for the null. */ - char str[CHAR_CLASS_MAX_LENGTH + 1]; - - PATFETCH (c); - c1 = 0; - - /* If pattern is `[[:'. */ - if (p == pend) FREE_STACK_RETURN (REG_EBRACK); - - for (;;) - { - PATFETCH (c); - if ((c == ':' && *p == ']') || p == pend) - break; - if (c1 < CHAR_CLASS_MAX_LENGTH) - str[c1++] = c; - else - /* This is in any case an invalid class name. */ - str[0] = '\0'; - } - str[c1] = '\0'; - - /* If isn't a word bracketed by `[:' and `:]': - undo the ending character, the letters, and leave - the leading `:' and `[' (but set bits for them). */ - if (c == ':' && *p == ']') - { -#if defined _LIBC || WIDE_CHAR_SUPPORT - boolean is_lower = STREQ (str, "lower"); - boolean is_upper = STREQ (str, "upper"); - wctype_t wt; - int ch; - - wt = IS_CHAR_CLASS (str); - if (wt == 0) - FREE_STACK_RETURN (REG_ECTYPE); - - /* Throw away the ] at the end of the character - class. */ - PATFETCH (c); - - if (p == pend) FREE_STACK_RETURN (REG_EBRACK); - - for (ch = 0; ch < 1 << BYTEWIDTH; ++ch) - { -# ifdef _LIBC - if (__iswctype (__btowc (ch), wt)) - SET_LIST_BIT (ch); -# else - if (iswctype (btowc (ch), wt)) - SET_LIST_BIT (ch); -# endif - - if (translate && (is_upper || is_lower) - && (ISUPPER (ch) || ISLOWER (ch))) - SET_LIST_BIT (ch); - } - - had_char_class = true; -#else - int ch; - boolean is_alnum = STREQ (str, "alnum"); - boolean is_alpha = STREQ (str, "alpha"); - boolean is_blank = STREQ (str, "blank"); - boolean is_cntrl = STREQ (str, "cntrl"); - boolean is_digit = STREQ (str, "digit"); - boolean is_graph = STREQ (str, "graph"); - boolean is_lower = STREQ (str, "lower"); - boolean is_print = STREQ (str, "print"); - boolean is_punct = STREQ (str, "punct"); - boolean is_space = STREQ (str, "space"); - boolean is_upper = STREQ (str, "upper"); - boolean is_xdigit = STREQ (str, "xdigit"); - - if (!IS_CHAR_CLASS (str)) - FREE_STACK_RETURN (REG_ECTYPE); - - /* Throw away the ] at the end of the character - class. */ - PATFETCH (c); - - if (p == pend) FREE_STACK_RETURN (REG_EBRACK); - - for (ch = 0; ch < 1 << BYTEWIDTH; ch++) - { - /* This was split into 3 if's to - avoid an arbitrary limit in some compiler. */ - if ( (is_alnum && ISALNUM (ch)) - || (is_alpha && ISALPHA (ch)) - || (is_blank && ISBLANK (ch)) - || (is_cntrl && ISCNTRL (ch))) - SET_LIST_BIT (ch); - if ( (is_digit && ISDIGIT (ch)) - || (is_graph && ISGRAPH (ch)) - || (is_lower && ISLOWER (ch)) - || (is_print && ISPRINT (ch))) - SET_LIST_BIT (ch); - if ( (is_punct && ISPUNCT (ch)) - || (is_space && ISSPACE (ch)) - || (is_upper && ISUPPER (ch)) - || (is_xdigit && ISXDIGIT (ch))) - SET_LIST_BIT (ch); - if ( translate && (is_upper || is_lower) - && (ISUPPER (ch) || ISLOWER (ch))) - SET_LIST_BIT (ch); - } - had_char_class = true; -#endif /* libc || wctype.h */ - } - else - { - c1++; - while (c1--) - PATUNFETCH; - SET_LIST_BIT ('['); - SET_LIST_BIT (':'); - had_char_class = false; - } - } - else - { - had_char_class = false; - SET_LIST_BIT (c); - } - } - - /* Discard any (non)matching list bytes that are all 0 at the - end of the map. Decrease the map-length byte too. */ - while ((int) b[-1] > 0 && b[b[-1] - 1] == 0) - b[-1]--; - b += b[-1]; - } - break; - - - case '(': - if (syntax & RE_NO_BK_PARENS) - goto handle_open; - else - goto normal_char; - - - case ')': - if (syntax & RE_NO_BK_PARENS) - goto handle_close; - else - goto normal_char; - - - case '\n': - if (syntax & RE_NEWLINE_ALT) - goto handle_alt; - else - goto normal_char; - - - case '|': - if (syntax & RE_NO_BK_VBAR) - goto handle_alt; - else - goto normal_char; - - - case '{': - if (syntax & RE_INTERVALS && syntax & RE_NO_BK_BRACES) - goto handle_interval; - else - goto normal_char; - - - case '\\': - if (p == pend) FREE_STACK_RETURN (REG_EESCAPE); - - /* Do not translate the character after the \, so that we can - distinguish, e.g., \B from \b, even if we normally would - translate, e.g., B to b. */ - PATFETCH_RAW (c); - - switch (c) - { - case '(': - if (syntax & RE_NO_BK_PARENS) - goto normal_backslash; - - handle_open: - bufp->re_nsub++; - regnum++; - - if (COMPILE_STACK_FULL) - { - RETALLOC (compile_stack.stack, compile_stack.size << 1, - compile_stack_elt_t); - if (compile_stack.stack == NULL) return REG_ESPACE; - - compile_stack.size <<= 1; - } - - /* These are the values to restore when we hit end of this - group. They are all relative offsets, so that if the - whole pattern moves because of realloc, they will still - be valid. */ - COMPILE_STACK_TOP.begalt_offset = begalt - bufp->buffer; - COMPILE_STACK_TOP.fixup_alt_jump - = fixup_alt_jump ? fixup_alt_jump - bufp->buffer + 1 : 0; - COMPILE_STACK_TOP.laststart_offset = b - bufp->buffer; - COMPILE_STACK_TOP.regnum = regnum; - - /* We will eventually replace the 0 with the number of - groups inner to this one. But do not push a - start_memory for groups beyond the last one we can - represent in the compiled pattern. */ - if (regnum <= MAX_REGNUM) - { - COMPILE_STACK_TOP.inner_group_offset = b - bufp->buffer + 2; - BUF_PUSH_3 (start_memory, regnum, 0); - } - - compile_stack.avail++; - - fixup_alt_jump = 0; - laststart = 0; - begalt = b; - /* If we've reached MAX_REGNUM groups, then this open - won't actually generate any code, so we'll have to - clear pending_exact explicitly. */ - pending_exact = 0; - break; - - - case ')': - if (syntax & RE_NO_BK_PARENS) goto normal_backslash; - - if (COMPILE_STACK_EMPTY) - { - if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) - goto normal_backslash; - else - FREE_STACK_RETURN (REG_ERPAREN); - } - - handle_close: - if (fixup_alt_jump) - { /* Push a dummy failure point at the end of the - alternative for a possible future - `pop_failure_jump' to pop. See comments at - `push_dummy_failure' in `re_match_2'. */ - BUF_PUSH (push_dummy_failure); - - /* We allocated space for this jump when we assigned - to `fixup_alt_jump', in the `handle_alt' case below. */ - STORE_JUMP (jump_past_alt, fixup_alt_jump, b - 1); - } - - /* See similar code for backslashed left paren above. */ - if (COMPILE_STACK_EMPTY) - { - if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) - goto normal_char; - else - FREE_STACK_RETURN (REG_ERPAREN); - } - - /* Since we just checked for an empty stack above, this - ``can't happen''. */ - assert (compile_stack.avail != 0); - { - /* We don't just want to restore into `regnum', because - later groups should continue to be numbered higher, - as in `(ab)c(de)' -- the second group is #2. */ - regnum_t this_group_regnum; - - compile_stack.avail--; - begalt = bufp->buffer + COMPILE_STACK_TOP.begalt_offset; - fixup_alt_jump - = COMPILE_STACK_TOP.fixup_alt_jump - ? bufp->buffer + COMPILE_STACK_TOP.fixup_alt_jump - 1 - : 0; - laststart = bufp->buffer + COMPILE_STACK_TOP.laststart_offset; - this_group_regnum = COMPILE_STACK_TOP.regnum; - /* If we've reached MAX_REGNUM groups, then this open - won't actually generate any code, so we'll have to - clear pending_exact explicitly. */ - pending_exact = 0; - - /* We're at the end of the group, so now we know how many - groups were inside this one. */ - if (this_group_regnum <= MAX_REGNUM) - { - unsigned char *inner_group_loc - = bufp->buffer + COMPILE_STACK_TOP.inner_group_offset; - - *inner_group_loc = regnum - this_group_regnum; - BUF_PUSH_3 (stop_memory, this_group_regnum, - regnum - this_group_regnum); - } - } - break; - - - case '|': /* `\|'. */ - if (syntax & RE_LIMITED_OPS || syntax & RE_NO_BK_VBAR) - goto normal_backslash; - handle_alt: - if (syntax & RE_LIMITED_OPS) - goto normal_char; - - /* Insert before the previous alternative a jump which - jumps to this alternative if the former fails. */ - GET_BUFFER_SPACE (3); - INSERT_JUMP (on_failure_jump, begalt, b + 6); - pending_exact = 0; - b += 3; - - /* The alternative before this one has a jump after it - which gets executed if it gets matched. Adjust that - jump so it will jump to this alternative's analogous - jump (put in below, which in turn will jump to the next - (if any) alternative's such jump, etc.). The last such - jump jumps to the correct final destination. A picture: - _____ _____ - | | | | - | v | v - a | b | c - - If we are at `b', then fixup_alt_jump right now points to a - three-byte space after `a'. We'll put in the jump, set - fixup_alt_jump to right after `b', and leave behind three - bytes which we'll fill in when we get to after `c'. */ - - if (fixup_alt_jump) - STORE_JUMP (jump_past_alt, fixup_alt_jump, b); - - /* Mark and leave space for a jump after this alternative, - to be filled in later either by next alternative or - when know we're at the end of a series of alternatives. */ - fixup_alt_jump = b; - GET_BUFFER_SPACE (3); - b += 3; - - laststart = 0; - begalt = b; - break; - - - case '{': - /* If \{ is a literal. */ - if (!(syntax & RE_INTERVALS) - /* If we're at `\{' and it's not the open-interval - operator. */ - || ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES)) - || (p - 2 == pattern && p == pend)) - goto normal_backslash; - - handle_interval: - { - /* If got here, then the syntax allows intervals. */ - - /* At least (most) this many matches must be made. */ - int lower_bound = -1, upper_bound = -1; - - beg_interval = p - 1; - - if (p == pend) - { - if (syntax & RE_NO_BK_BRACES) - goto unfetch_interval; - else - FREE_STACK_RETURN (REG_EBRACE); - } - - GET_UNSIGNED_NUMBER (lower_bound); - - if (c == ',') - { - GET_UNSIGNED_NUMBER (upper_bound); - if (upper_bound < 0) upper_bound = RE_DUP_MAX; - } - else - /* Interval such as `{1}' => match exactly once. */ - upper_bound = lower_bound; - - if (lower_bound < 0 || upper_bound > RE_DUP_MAX - || lower_bound > upper_bound) - { - if (syntax & RE_NO_BK_BRACES) - goto unfetch_interval; - else - FREE_STACK_RETURN (REG_BADBR); - } - - if (!(syntax & RE_NO_BK_BRACES)) - { - if (c != '\\') FREE_STACK_RETURN (REG_EBRACE); - - PATFETCH (c); - } - - if (c != '}') - { - if (syntax & RE_NO_BK_BRACES) - goto unfetch_interval; - else - FREE_STACK_RETURN (REG_BADBR); - } - - /* We just parsed a valid interval. */ - - /* If it's invalid to have no preceding re. */ - if (!laststart) - { - if (syntax & RE_CONTEXT_INVALID_OPS) - FREE_STACK_RETURN (REG_BADRPT); - else if (syntax & RE_CONTEXT_INDEP_OPS) - laststart = b; - else - goto unfetch_interval; - } - - /* If the upper bound is zero, don't want to succeed at - all; jump from `laststart' to `b + 3', which will be - the end of the buffer after we insert the jump. */ - if (upper_bound == 0) - { - GET_BUFFER_SPACE (3); - INSERT_JUMP (jump, laststart, b + 3); - b += 3; - } - - /* Otherwise, we have a nontrivial interval. When - we're all done, the pattern will look like: - set_number_at <jump count> <upper bound> - set_number_at <succeed_n count> <lower bound> - succeed_n <after jump addr> <succeed_n count> - <body of loop> - jump_n <succeed_n addr> <jump count> - (The upper bound and `jump_n' are omitted if - `upper_bound' is 1, though.) */ - else - { /* If the upper bound is > 1, we need to insert - more at the end of the loop. */ - unsigned nbytes = 10 + (upper_bound > 1) * 10; - - GET_BUFFER_SPACE (nbytes); - - /* Initialize lower bound of the `succeed_n', even - though it will be set during matching by its - attendant `set_number_at' (inserted next), - because `re_compile_fastmap' needs to know. - Jump to the `jump_n' we might insert below. */ - INSERT_JUMP2 (succeed_n, laststart, - b + 5 + (upper_bound > 1) * 5, - lower_bound); - b += 5; - - /* Code to initialize the lower bound. Insert - before the `succeed_n'. The `5' is the last two - bytes of this `set_number_at', plus 3 bytes of - the following `succeed_n'. */ - insert_op2 (set_number_at, laststart, 5, lower_bound, b); - b += 5; - - if (upper_bound > 1) - { /* More than one repetition is allowed, so - append a backward jump to the `succeed_n' - that starts this interval. - - When we've reached this during matching, - we'll have matched the interval once, so - jump back only `upper_bound - 1' times. */ - STORE_JUMP2 (jump_n, b, laststart + 5, - upper_bound - 1); - b += 5; - - /* The location we want to set is the second - parameter of the `jump_n'; that is `b-2' as - an absolute address. `laststart' will be - the `set_number_at' we're about to insert; - `laststart+3' the number to set, the source - for the relative address. But we are - inserting into the middle of the pattern -- - so everything is getting moved up by 5. - Conclusion: (b - 2) - (laststart + 3) + 5, - i.e., b - laststart. - - We insert this at the beginning of the loop - so that if we fail during matching, we'll - reinitialize the bounds. */ - insert_op2 (set_number_at, laststart, b - laststart, - upper_bound - 1, b); - b += 5; - } - } - pending_exact = 0; - beg_interval = NULL; - } - break; - - unfetch_interval: - /* If an invalid interval, match the characters as literals. */ - assert (beg_interval); - p = beg_interval; - beg_interval = NULL; - - /* normal_char and normal_backslash need `c'. */ - PATFETCH (c); - - if (!(syntax & RE_NO_BK_BRACES)) - { - if (p > pattern && p[-1] == '\\') - goto normal_backslash; - } - goto normal_char; - -#ifdef emacs - /* There is no way to specify the before_dot and after_dot - operators. rms says this is ok. --karl */ - case '=': - BUF_PUSH (at_dot); - break; - - case 's': - laststart = b; - PATFETCH (c); - BUF_PUSH_2 (syntaxspec, syntax_spec_code[c]); - break; - - case 'S': - laststart = b; - PATFETCH (c); - BUF_PUSH_2 (notsyntaxspec, syntax_spec_code[c]); - break; -#endif /* emacs */ - - - case 'w': - if (syntax & RE_NO_GNU_OPS) - goto normal_char; - laststart = b; - BUF_PUSH (wordchar); - break; - - - case 'W': - if (syntax & RE_NO_GNU_OPS) - goto normal_char; - laststart = b; - BUF_PUSH (notwordchar); - break; - - - case '<': - if (syntax & RE_NO_GNU_OPS) - goto normal_char; - BUF_PUSH (wordbeg); - break; - - case '>': - if (syntax & RE_NO_GNU_OPS) - goto normal_char; - BUF_PUSH (wordend); - break; - - case 'b': - if (syntax & RE_NO_GNU_OPS) - goto normal_char; - BUF_PUSH (wordbound); - break; - - case 'B': - if (syntax & RE_NO_GNU_OPS) - goto normal_char; - BUF_PUSH (notwordbound); - break; - - case '`': - if (syntax & RE_NO_GNU_OPS) - goto normal_char; - BUF_PUSH (begbuf); - break; - - case '\'': - if (syntax & RE_NO_GNU_OPS) - goto normal_char; - BUF_PUSH (endbuf); - break; - - case '1': case '2': case '3': case '4': case '5': - case '6': case '7': case '8': case '9': - if (syntax & RE_NO_BK_REFS) - goto normal_char; - - c1 = c - '0'; - - if (c1 > regnum) - FREE_STACK_RETURN (REG_ESUBREG); - - /* Can't back reference to a subexpression if inside of it. */ - if (group_in_compile_stack (compile_stack, (regnum_t) c1)) - goto normal_char; - - laststart = b; - BUF_PUSH_2 (duplicate, c1); - break; - - - case '+': - case '?': - if (syntax & RE_BK_PLUS_QM) - goto handle_plus; - else - goto normal_backslash; - - default: - normal_backslash: - /* You might think it would be useful for \ to mean - not to translate; but if we don't translate it - it will never match anything. */ - c = TRANSLATE (c); - goto normal_char; - } - break; - - - default: - /* Expects the character in `c'. */ - normal_char: - /* If no exactn currently being built. */ - if (!pending_exact - - /* If last exactn not at current position. */ - || pending_exact + *pending_exact + 1 != b - - /* We have only one byte following the exactn for the count. */ - || *pending_exact == (1 << BYTEWIDTH) - 1 - - /* If followed by a repetition operator. */ - || *p == '*' || *p == '^' - || ((syntax & RE_BK_PLUS_QM) - ? *p == '\\' && (p[1] == '+' || p[1] == '?') - : (*p == '+' || *p == '?')) - || ((syntax & RE_INTERVALS) - && ((syntax & RE_NO_BK_BRACES) - ? *p == '{' - : (p[0] == '\\' && p[1] == '{')))) - { - /* Start building a new exactn. */ - - laststart = b; - - BUF_PUSH_2 (exactn, 0); - pending_exact = b - 1; - } - - BUF_PUSH (c); - (*pending_exact)++; - break; - } /* switch (c) */ - } /* while p != pend */ - - - /* Through the pattern now. */ - - if (fixup_alt_jump) - STORE_JUMP (jump_past_alt, fixup_alt_jump, b); - - if (!COMPILE_STACK_EMPTY) - FREE_STACK_RETURN (REG_EPAREN); - - /* If we don't want backtracking, force success - the first time we reach the end of the compiled pattern. */ - if (syntax & RE_NO_POSIX_BACKTRACKING) - BUF_PUSH (succeed); - - free (compile_stack.stack); - - /* We have succeeded; set the length of the buffer. */ - bufp->used = b - bufp->buffer; - -#ifdef DEBUG - if (debug) - { - DEBUG_PRINT1 ("\nCompiled pattern: \n"); - print_compiled_pattern (bufp); - } -#endif /* DEBUG */ - -#ifndef MATCH_MAY_ALLOCATE - /* Initialize the failure stack to the largest possible stack. This - isn't necessary unless we're trying to avoid calling alloca in - the search and match routines. */ - { - int num_regs = bufp->re_nsub + 1; - - /* Since DOUBLE_FAIL_STACK refuses to double only if the current size - is strictly greater than re_max_failures, the largest possible stack - is 2 * re_max_failures failure points. */ - if (fail_stack.size < (2 * re_max_failures * MAX_FAILURE_ITEMS)) - { - fail_stack.size = (2 * re_max_failures * MAX_FAILURE_ITEMS); - -# ifdef emacs - if (! fail_stack.stack) - fail_stack.stack - = (fail_stack_elt_t *) xmalloc (fail_stack.size - * sizeof (fail_stack_elt_t)); - else - fail_stack.stack - = (fail_stack_elt_t *) xrealloc (fail_stack.stack, - (fail_stack.size - * sizeof (fail_stack_elt_t))); -# else /* not emacs */ - if (! fail_stack.stack) - fail_stack.stack - = (fail_stack_elt_t *) malloc (fail_stack.size - * sizeof (fail_stack_elt_t)); - else - fail_stack.stack - = (fail_stack_elt_t *) realloc (fail_stack.stack, - (fail_stack.size - * sizeof (fail_stack_elt_t))); -# endif /* not emacs */ - } - - regex_grow_registers (num_regs); - } -#endif /* not MATCH_MAY_ALLOCATE */ - - return REG_NOERROR; -} /* regex_compile */ - -/* Subroutines for `regex_compile'. */ - -/* Store OP at LOC followed by two-byte integer parameter ARG. */ - -static void -store_op1 (op, loc, arg) - re_opcode_t op; - unsigned char *loc; - int arg; -{ - *loc = (unsigned char) op; - STORE_NUMBER (loc + 1, arg); -} - - -/* Like `store_op1', but for two two-byte parameters ARG1 and ARG2. */ - -static void -store_op2 (op, loc, arg1, arg2) - re_opcode_t op; - unsigned char *loc; - int arg1, arg2; -{ - *loc = (unsigned char) op; - STORE_NUMBER (loc + 1, arg1); - STORE_NUMBER (loc + 3, arg2); -} - - -/* Copy the bytes from LOC to END to open up three bytes of space at LOC - for OP followed by two-byte integer parameter ARG. */ - -static void -insert_op1 (op, loc, arg, end) - re_opcode_t op; - unsigned char *loc; - int arg; - unsigned char *end; -{ - register unsigned char *pfrom = end; - register unsigned char *pto = end + 3; - - while (pfrom != loc) - *--pto = *--pfrom; - - store_op1 (op, loc, arg); -} - - -/* Like `insert_op1', but for two two-byte parameters ARG1 and ARG2. */ - -static void -insert_op2 (op, loc, arg1, arg2, end) - re_opcode_t op; - unsigned char *loc; - int arg1, arg2; - unsigned char *end; -{ - register unsigned char *pfrom = end; - register unsigned char *pto = end + 5; - - while (pfrom != loc) - *--pto = *--pfrom; - - store_op2 (op, loc, arg1, arg2); -} - - -/* P points to just after a ^ in PATTERN. Return true if that ^ comes - after an alternative or a begin-subexpression. We assume there is at - least one character before the ^. */ - -static boolean -at_begline_loc_p (pattern, p, syntax) - const char *pattern, *p; - reg_syntax_t syntax; -{ - const char *prev = p - 2; - boolean prev_prev_backslash = prev > pattern && prev[-1] == '\\'; - - return - /* After a subexpression? */ - (*prev == '(' && (syntax & RE_NO_BK_PARENS || prev_prev_backslash)) - /* After an alternative? */ - || (*prev == '|' && (syntax & RE_NO_BK_VBAR || prev_prev_backslash)); -} - - -/* The dual of at_begline_loc_p. This one is for $. We assume there is - at least one character after the $, i.e., `P < PEND'. */ - -static boolean -at_endline_loc_p (p, pend, syntax) - const char *p, *pend; - reg_syntax_t syntax; -{ - const char *next = p; - boolean next_backslash = *next == '\\'; - const char *next_next = p + 1 < pend ? p + 1 : 0; - - return - /* Before a subexpression? */ - (syntax & RE_NO_BK_PARENS ? *next == ')' - : next_backslash && next_next && *next_next == ')') - /* Before an alternative? */ - || (syntax & RE_NO_BK_VBAR ? *next == '|' - : next_backslash && next_next && *next_next == '|'); -} - - -/* Returns true if REGNUM is in one of COMPILE_STACK's elements and - false if it's not. */ - -static boolean -group_in_compile_stack (compile_stack, regnum) - compile_stack_type compile_stack; - regnum_t regnum; -{ - int this_element; - - for (this_element = compile_stack.avail - 1; - this_element >= 0; - this_element--) - if (compile_stack.stack[this_element].regnum == regnum) - return true; - - return false; -} - - -/* Read the ending character of a range (in a bracket expression) from the - uncompiled pattern *P_PTR (which ends at PEND). We assume the - starting character is in `P[-2]'. (`P[-1]' is the character `-'.) - Then we set the translation of all bits between the starting and - ending characters (inclusive) in the compiled pattern B. - - Return an error code. - - We use these short variable names so we can use the same macros as - `regex_compile' itself. */ - -static reg_errcode_t -compile_range (p_ptr, pend, translate, syntax, b) - const char **p_ptr, *pend; - RE_TRANSLATE_TYPE translate; - reg_syntax_t syntax; - unsigned char *b; -{ - unsigned this_char; - - const char *p = *p_ptr; - unsigned int range_start, range_end; - - if (p == pend) - return REG_ERANGE; - - /* Even though the pattern is a signed `char *', we need to fetch - with unsigned char *'s; if the high bit of the pattern character - is set, the range endpoints will be negative if we fetch using a - signed char *. - - We also want to fetch the endpoints without translating them; the - appropriate translation is done in the bit-setting loop below. */ - /* The SVR4 compiler on the 3B2 had trouble with unsigned const char *. */ - range_start = ((const unsigned char *) p)[-2]; - range_end = ((const unsigned char *) p)[0]; - - /* Have to increment the pointer into the pattern string, so the - caller isn't still at the ending character. */ - (*p_ptr)++; - - /* If the start is after the end, the range is empty. */ - if (range_start > range_end) - return syntax & RE_NO_EMPTY_RANGES ? REG_ERANGE : REG_NOERROR; - - /* Here we see why `this_char' has to be larger than an `unsigned - char' -- the range is inclusive, so if `range_end' == 0xff - (assuming 8-bit characters), we would otherwise go into an infinite - loop, since all characters <= 0xff. */ - for (this_char = range_start; this_char <= range_end; this_char++) - { - SET_LIST_BIT (TRANSLATE (this_char)); - } - - return REG_NOERROR; -} - -/* re_compile_fastmap computes a ``fastmap'' for the compiled pattern in - BUFP. A fastmap records which of the (1 << BYTEWIDTH) possible - characters can start a string that matches the pattern. This fastmap - is used by re_search to skip quickly over impossible starting points. - - The caller must supply the address of a (1 << BYTEWIDTH)-byte data - area as BUFP->fastmap. - - We set the `fastmap', `fastmap_accurate', and `can_be_null' fields in - the pattern buffer. - - Returns 0 if we succeed, -2 if an internal error. */ - -int -re_compile_fastmap (bufp) - struct re_pattern_buffer *bufp; -{ - int j, k; -#ifdef MATCH_MAY_ALLOCATE - fail_stack_type fail_stack; -#endif -#ifndef REGEX_MALLOC - char *destination; -#endif - - register char *fastmap = bufp->fastmap; - unsigned char *pattern = bufp->buffer; - unsigned char *p = pattern; - register unsigned char *pend = pattern + bufp->used; - -#ifdef REL_ALLOC - /* This holds the pointer to the failure stack, when - it is allocated relocatably. */ - fail_stack_elt_t *failure_stack_ptr; -#endif - - /* Assume that each path through the pattern can be null until - proven otherwise. We set this false at the bottom of switch - statement, to which we get only if a particular path doesn't - match the empty string. */ - boolean path_can_be_null = true; - - /* We aren't doing a `succeed_n' to begin with. */ - boolean succeed_n_p = false; - - assert (fastmap != NULL && p != NULL); - - INIT_FAIL_STACK (); - memset (fastmap, 0, 1 << BYTEWIDTH); /* Assume nothing's valid. */ - bufp->fastmap_accurate = 1; /* It will be when we're done. */ - bufp->can_be_null = 0; - - while (1) - { - if (p == pend || *p == succeed) - { - /* We have reached the (effective) end of pattern. */ - if (!FAIL_STACK_EMPTY ()) - { - bufp->can_be_null |= path_can_be_null; - - /* Reset for next path. */ - path_can_be_null = true; - - p = fail_stack.stack[--fail_stack.avail].pointer; - - continue; - } - else - break; - } - - /* We should never be about to go beyond the end of the pattern. */ - assert (p < pend); - - switch (SWITCH_ENUM_CAST ((re_opcode_t) *p++)) - { - - /* I guess the idea here is to simply not bother with a fastmap - if a backreference is used, since it's too hard to figure out - the fastmap for the corresponding group. Setting - `can_be_null' stops `re_search_2' from using the fastmap, so - that is all we do. */ - case duplicate: - bufp->can_be_null = 1; - goto done; - - - /* Following are the cases which match a character. These end - with `break'. */ - - case exactn: - fastmap[p[1]] = 1; - break; - - - case charset: - for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--) - if (p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))) - fastmap[j] = 1; - break; - - - case charset_not: - /* Chars beyond end of map must be allowed. */ - for (j = *p * BYTEWIDTH; j < (1 << BYTEWIDTH); j++) - fastmap[j] = 1; - - for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--) - if (!(p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH)))) - fastmap[j] = 1; - break; - - - case wordchar: - for (j = 0; j < (1 << BYTEWIDTH); j++) - if (SYNTAX (j) == Sword) - fastmap[j] = 1; - break; - - - case notwordchar: - for (j = 0; j < (1 << BYTEWIDTH); j++) - if (SYNTAX (j) != Sword) - fastmap[j] = 1; - break; - - - case anychar: - { - int fastmap_newline = fastmap['\n']; - - /* `.' matches anything ... */ - for (j = 0; j < (1 << BYTEWIDTH); j++) - fastmap[j] = 1; - - /* ... except perhaps newline. */ - if (!(bufp->syntax & RE_DOT_NEWLINE)) - fastmap['\n'] = fastmap_newline; - - /* Return if we have already set `can_be_null'; if we have, - then the fastmap is irrelevant. Something's wrong here. */ - else if (bufp->can_be_null) - goto done; - - /* Otherwise, have to check alternative paths. */ - break; - } - -#ifdef emacs - case syntaxspec: - k = *p++; - for (j = 0; j < (1 << BYTEWIDTH); j++) - if (SYNTAX (j) == (enum syntaxcode) k) - fastmap[j] = 1; - break; - - - case notsyntaxspec: - k = *p++; - for (j = 0; j < (1 << BYTEWIDTH); j++) - if (SYNTAX (j) != (enum syntaxcode) k) - fastmap[j] = 1; - break; - - - /* All cases after this match the empty string. These end with - `continue'. */ - - - case before_dot: - case at_dot: - case after_dot: - continue; -#endif /* emacs */ - - - case no_op: - case begline: - case endline: - case begbuf: - case endbuf: - case wordbound: - case notwordbound: - case wordbeg: - case wordend: - case push_dummy_failure: - continue; - - - case jump_n: - case pop_failure_jump: - case maybe_pop_jump: - case jump: - case jump_past_alt: - case dummy_failure_jump: - EXTRACT_NUMBER_AND_INCR (j, p); - p += j; - if (j > 0) - continue; - - /* Jump backward implies we just went through the body of a - loop and matched nothing. Opcode jumped to should be - `on_failure_jump' or `succeed_n'. Just treat it like an - ordinary jump. For a * loop, it has pushed its failure - point already; if so, discard that as redundant. */ - if ((re_opcode_t) *p != on_failure_jump - && (re_opcode_t) *p != succeed_n) - continue; - - p++; - EXTRACT_NUMBER_AND_INCR (j, p); - p += j; - - /* If what's on the stack is where we are now, pop it. */ - if (!FAIL_STACK_EMPTY () - && fail_stack.stack[fail_stack.avail - 1].pointer == p) - fail_stack.avail--; - - continue; - - - case on_failure_jump: - case on_failure_keep_string_jump: - handle_on_failure_jump: - EXTRACT_NUMBER_AND_INCR (j, p); - - /* For some patterns, e.g., `(a?)?', `p+j' here points to the - end of the pattern. We don't want to push such a point, - since when we restore it above, entering the switch will - increment `p' past the end of the pattern. We don't need - to push such a point since we obviously won't find any more - fastmap entries beyond `pend'. Such a pattern can match - the null string, though. */ - if (p + j < pend) - { - if (!PUSH_PATTERN_OP (p + j, fail_stack)) - { - RESET_FAIL_STACK (); - return -2; - } - } - else - bufp->can_be_null = 1; - - if (succeed_n_p) - { - EXTRACT_NUMBER_AND_INCR (k, p); /* Skip the n. */ - succeed_n_p = false; - } - - continue; - - - case succeed_n: - /* Get to the number of times to succeed. */ - p += 2; - - /* Increment p past the n for when k != 0. */ - EXTRACT_NUMBER_AND_INCR (k, p); - if (k == 0) - { - p -= 4; - succeed_n_p = true; /* Spaghetti code alert. */ - goto handle_on_failure_jump; - } - continue; - - - case set_number_at: - p += 4; - continue; - - - case start_memory: - case stop_memory: - p += 2; - continue; - - - default: - abort (); /* We have listed all the cases. */ - } /* switch *p++ */ - - /* Getting here means we have found the possible starting - characters for one path of the pattern -- and that the empty - string does not match. We need not follow this path further. - Instead, look at the next alternative (remembered on the - stack), or quit if no more. The test at the top of the loop - does these things. */ - path_can_be_null = false; - p = pend; - } /* while p */ - - /* Set `can_be_null' for the last path (also the first path, if the - pattern is empty). */ - bufp->can_be_null |= path_can_be_null; - - done: - RESET_FAIL_STACK (); - return 0; -} /* re_compile_fastmap */ -#ifdef _LIBC -weak_alias (__re_compile_fastmap, re_compile_fastmap) -#endif - -/* Set REGS to hold NUM_REGS registers, storing them in STARTS and - ENDS. Subsequent matches using PATTERN_BUFFER and REGS will use - this memory for recording register information. STARTS and ENDS - must be allocated using the malloc library routine, and must each - be at least NUM_REGS * sizeof (regoff_t) bytes long. - - If NUM_REGS == 0, then subsequent matches should allocate their own - register data. - - Unless this function is called, the first search or match using - PATTERN_BUFFER will allocate its own register data, without - freeing the old data. */ - -void -re_set_registers (bufp, regs, num_regs, starts, ends) - struct re_pattern_buffer *bufp; - struct re_registers *regs; - unsigned num_regs; - regoff_t *starts, *ends; -{ - if (num_regs) - { - bufp->regs_allocated = REGS_REALLOCATE; - regs->num_regs = num_regs; - regs->start = starts; - regs->end = ends; - } - else - { - bufp->regs_allocated = REGS_UNALLOCATED; - regs->num_regs = 0; - regs->start = regs->end = (regoff_t *) 0; - } -} -#ifdef _LIBC -weak_alias (__re_set_registers, re_set_registers) -#endif - -/* Searching routines. */ - -/* Like re_search_2, below, but only one string is specified, and - doesn't let you say where to stop matching. */ - -int -re_search (bufp, string, size, startpos, range, regs) - struct re_pattern_buffer *bufp; - const char *string; - int size, startpos, range; - struct re_registers *regs; -{ - return re_search_2 (bufp, NULL, 0, string, size, startpos, range, - regs, size); -} -#ifdef _LIBC -weak_alias (__re_search, re_search) -#endif - - -/* Using the compiled pattern in BUFP->buffer, first tries to match the - virtual concatenation of STRING1 and STRING2, starting first at index - STARTPOS, then at STARTPOS + 1, and so on. - - STRING1 and STRING2 have length SIZE1 and SIZE2, respectively. - - RANGE is how far to scan while trying to match. RANGE = 0 means try - only at STARTPOS; in general, the last start tried is STARTPOS + - RANGE. - - In REGS, return the indices of the virtual concatenation of STRING1 - and STRING2 that matched the entire BUFP->buffer and its contained - subexpressions. - - Do not consider matching one past the index STOP in the virtual - concatenation of STRING1 and STRING2. - - We return either the position in the strings at which the match was - found, -1 if no match, or -2 if error (such as failure - stack overflow). */ - -int -re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop) - struct re_pattern_buffer *bufp; - const char *string1, *string2; - int size1, size2; - int startpos; - int range; - struct re_registers *regs; - int stop; -{ - int val; - register char *fastmap = bufp->fastmap; - register RE_TRANSLATE_TYPE translate = bufp->translate; - int total_size = size1 + size2; - int endpos = startpos + range; - - /* Check for out-of-range STARTPOS. */ - if (startpos < 0 || startpos > total_size) - return -1; - - /* Fix up RANGE if it might eventually take us outside - the virtual concatenation of STRING1 and STRING2. - Make sure we won't move STARTPOS below 0 or above TOTAL_SIZE. */ - if (endpos < 0) - range = 0 - startpos; - else if (endpos > total_size) - range = total_size - startpos; - - /* If the search isn't to be a backwards one, don't waste time in a - search for a pattern that must be anchored. */ - if (bufp->used > 0 && range > 0 - && ((re_opcode_t) bufp->buffer[0] == begbuf - /* `begline' is like `begbuf' if it cannot match at newlines. */ - || ((re_opcode_t) bufp->buffer[0] == begline - && !bufp->newline_anchor))) - { - if (startpos > 0) - return -1; - else - range = 1; - } - -#ifdef emacs - /* In a forward search for something that starts with \=. - don't keep searching past point. */ - if (bufp->used > 0 && (re_opcode_t) bufp->buffer[0] == at_dot && range > 0) - { - range = PT - startpos; - if (range <= 0) - return -1; - } -#endif /* emacs */ - - /* Update the fastmap now if not correct already. */ - if (fastmap && !bufp->fastmap_accurate) - if (re_compile_fastmap (bufp) == -2) - return -2; - - /* Loop through the string, looking for a place to start matching. */ - for (;;) - { - /* If a fastmap is supplied, skip quickly over characters that - cannot be the start of a match. If the pattern can match the - null string, however, we don't need to skip characters; we want - the first null string. */ - if (fastmap && startpos < total_size && !bufp->can_be_null) - { - if (range > 0) /* Searching forwards. */ - { - register const char *d; - register int lim = 0; - int irange = range; - - if (startpos < size1 && startpos + range >= size1) - lim = range - (size1 - startpos); - - d = (startpos >= size1 ? string2 - size1 : string1) + startpos; - - /* Written out as an if-else to avoid testing `translate' - inside the loop. */ - if (translate) - while (range > lim - && !fastmap[(unsigned char) - translate[(unsigned char) *d++]]) - range--; - else - while (range > lim && !fastmap[(unsigned char) *d++]) - range--; - - startpos += irange - range; - } - else /* Searching backwards. */ - { - register char c = (size1 == 0 || startpos >= size1 - ? string2[startpos - size1] - : string1[startpos]); - - if (!fastmap[(unsigned char) TRANSLATE (c)]) - goto advance; - } - } - - /* If can't match the null string, and that's all we have left, fail. */ - if (range >= 0 && startpos == total_size && fastmap - && !bufp->can_be_null) - return -1; - - val = re_match_2_internal (bufp, string1, size1, string2, size2, - startpos, regs, stop); -#ifndef REGEX_MALLOC -# ifdef C_ALLOCA - alloca (0); -# endif -#endif - - if (val >= 0) - return startpos; - - if (val == -2) - return -2; - - advance: - if (!range) - break; - else if (range > 0) - { - range--; - startpos++; - } - else - { - range++; - startpos--; - } - } - return -1; -} /* re_search_2 */ -#ifdef _LIBC -weak_alias (__re_search_2, re_search_2) -#endif - -/* This converts PTR, a pointer into one of the search strings `string1' - and `string2' into an offset from the beginning of that string. */ -#define POINTER_TO_OFFSET(ptr) \ - (FIRST_STRING_P (ptr) \ - ? ((regoff_t) ((ptr) - string1)) \ - : ((regoff_t) ((ptr) - string2 + size1))) - -/* Macros for dealing with the split strings in re_match_2. */ - -#define MATCHING_IN_FIRST_STRING (dend == end_match_1) - -/* Call before fetching a character with *d. This switches over to - string2 if necessary. */ -#define PREFETCH() \ - while (d == dend) \ - { \ - /* End of string2 => fail. */ \ - if (dend == end_match_2) \ - goto fail; \ - /* End of string1 => advance to string2. */ \ - d = string2; \ - dend = end_match_2; \ - } - - -/* Test if at very beginning or at very end of the virtual concatenation - of `string1' and `string2'. If only one string, it's `string2'. */ -#define AT_STRINGS_BEG(d) ((d) == (size1 ? string1 : string2) || !size2) -#define AT_STRINGS_END(d) ((d) == end2) - - -/* Test if D points to a character which is word-constituent. We have - two special cases to check for: if past the end of string1, look at - the first character in string2; and if before the beginning of - string2, look at the last character in string1. */ -#define WORDCHAR_P(d) \ - (SYNTAX ((d) == end1 ? *string2 \ - : (d) == string2 - 1 ? *(end1 - 1) : *(d)) \ - == Sword) - -/* Disabled due to a compiler bug -- see comment at case wordbound */ -#if 0 -/* Test if the character before D and the one at D differ with respect - to being word-constituent. */ -#define AT_WORD_BOUNDARY(d) \ - (AT_STRINGS_BEG (d) || AT_STRINGS_END (d) \ - || WORDCHAR_P (d - 1) != WORDCHAR_P (d)) -#endif - -/* Free everything we malloc. */ -#ifdef MATCH_MAY_ALLOCATE -# define FREE_VAR(var) if (var) REGEX_FREE (var); var = NULL -# define FREE_VARIABLES() \ - do { \ - REGEX_FREE_STACK (fail_stack.stack); \ - FREE_VAR (regstart); \ - FREE_VAR (regend); \ - FREE_VAR (old_regstart); \ - FREE_VAR (old_regend); \ - FREE_VAR (best_regstart); \ - FREE_VAR (best_regend); \ - FREE_VAR (reg_info); \ - FREE_VAR (reg_dummy); \ - FREE_VAR (reg_info_dummy); \ - } while (0) -#else -# define FREE_VARIABLES() ((void)0) /* Do nothing! But inhibit gcc warning. */ -#endif /* not MATCH_MAY_ALLOCATE */ - -/* These values must meet several constraints. They must not be valid - register values; since we have a limit of 255 registers (because - we use only one byte in the pattern for the register number), we can - use numbers larger than 255. They must differ by 1, because of - NUM_FAILURE_ITEMS above. And the value for the lowest register must - be larger than the value for the highest register, so we do not try - to actually save any registers when none are active. */ -#define NO_HIGHEST_ACTIVE_REG (1 << BYTEWIDTH) -#define NO_LOWEST_ACTIVE_REG (NO_HIGHEST_ACTIVE_REG + 1) - -/* Matching routines. */ - -#ifndef emacs /* Emacs never uses this. */ -/* re_match is like re_match_2 except it takes only a single string. */ - -int -re_match (bufp, string, size, pos, regs) - struct re_pattern_buffer *bufp; - const char *string; - int size, pos; - struct re_registers *regs; -{ - int result = re_match_2_internal (bufp, NULL, 0, string, size, - pos, regs, size); -# ifndef REGEX_MALLOC -# ifdef C_ALLOCA - alloca (0); -# endif -# endif - return result; -} -# ifdef _LIBC -weak_alias (__re_match, re_match) -# endif -#endif /* not emacs */ - -static boolean group_match_null_string_p _RE_ARGS ((unsigned char **p, - unsigned char *end, - register_info_type *reg_info)); -static boolean alt_match_null_string_p _RE_ARGS ((unsigned char *p, - unsigned char *end, - register_info_type *reg_info)); -static boolean common_op_match_null_string_p _RE_ARGS ((unsigned char **p, - unsigned char *end, - register_info_type *reg_info)); -static int bcmp_translate _RE_ARGS ((const char *s1, const char *s2, - int len, char *translate)); - -/* re_match_2 matches the compiled pattern in BUFP against the - the (virtual) concatenation of STRING1 and STRING2 (of length SIZE1 - and SIZE2, respectively). We start matching at POS, and stop - matching at STOP. - - If REGS is non-null and the `no_sub' field of BUFP is nonzero, we - store offsets for the substring each group matched in REGS. See the - documentation for exactly how many groups we fill. - - We return -1 if no match, -2 if an internal error (such as the - failure stack overflowing). Otherwise, we return the length of the - matched substring. */ - -int -re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) - struct re_pattern_buffer *bufp; - const char *string1, *string2; - int size1, size2; - int pos; - struct re_registers *regs; - int stop; -{ - int result = re_match_2_internal (bufp, string1, size1, string2, size2, - pos, regs, stop); -#ifndef REGEX_MALLOC -# ifdef C_ALLOCA - alloca (0); -# endif -#endif - return result; -} -#ifdef _LIBC -weak_alias (__re_match_2, re_match_2) -#endif - -/* This is a separate function so that we can force an alloca cleanup - afterwards. */ -static int -re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop) - struct re_pattern_buffer *bufp; - const char *string1, *string2; - int size1, size2; - int pos; - struct re_registers *regs; - int stop; -{ - /* General temporaries. */ - int mcnt; - unsigned char *p1; - - /* Just past the end of the corresponding string. */ - const char *end1, *end2; - - /* Pointers into string1 and string2, just past the last characters in - each to consider matching. */ - const char *end_match_1, *end_match_2; - - /* Where we are in the data, and the end of the current string. */ - const char *d, *dend; - - /* Where we are in the pattern, and the end of the pattern. */ - unsigned char *p = bufp->buffer; - register unsigned char *pend = p + bufp->used; - - /* Mark the opcode just after a start_memory, so we can test for an - empty subpattern when we get to the stop_memory. */ - unsigned char *just_past_start_mem = 0; - - /* We use this to map every character in the string. */ - RE_TRANSLATE_TYPE translate = bufp->translate; - - /* Failure point stack. Each place that can handle a failure further - down the line pushes a failure point on this stack. It consists of - restart, regend, and reg_info for all registers corresponding to - the subexpressions we're currently inside, plus the number of such - registers, and, finally, two char *'s. The first char * is where - to resume scanning the pattern; the second one is where to resume - scanning the strings. If the latter is zero, the failure point is - a ``dummy''; if a failure happens and the failure point is a dummy, - it gets discarded and the next next one is tried. */ -#ifdef MATCH_MAY_ALLOCATE /* otherwise, this is global. */ - fail_stack_type fail_stack; -#endif -#ifdef DEBUG - static unsigned failure_id; - unsigned nfailure_points_pushed = 0, nfailure_points_popped = 0; -#endif - -#ifdef REL_ALLOC - /* This holds the pointer to the failure stack, when - it is allocated relocatably. */ - fail_stack_elt_t *failure_stack_ptr; -#endif - - /* We fill all the registers internally, independent of what we - return, for use in backreferences. The number here includes - an element for register zero. */ - size_t num_regs = bufp->re_nsub + 1; - - /* The currently active registers. */ - active_reg_t lowest_active_reg = NO_LOWEST_ACTIVE_REG; - active_reg_t highest_active_reg = NO_HIGHEST_ACTIVE_REG; - - /* Information on the contents of registers. These are pointers into - the input strings; they record just what was matched (on this - attempt) by a subexpression part of the pattern, that is, the - regnum-th regstart pointer points to where in the pattern we began - matching and the regnum-th regend points to right after where we - stopped matching the regnum-th subexpression. (The zeroth register - keeps track of what the whole pattern matches.) */ -#ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global. */ - const char **regstart, **regend; -#endif - - /* If a group that's operated upon by a repetition operator fails to - match anything, then the register for its start will need to be - restored because it will have been set to wherever in the string we - are when we last see its open-group operator. Similarly for a - register's end. */ -#ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global. */ - const char **old_regstart, **old_regend; -#endif - - /* The is_active field of reg_info helps us keep track of which (possibly - nested) subexpressions we are currently in. The matched_something - field of reg_info[reg_num] helps us tell whether or not we have - matched any of the pattern so far this time through the reg_num-th - subexpression. These two fields get reset each time through any - loop their register is in. */ -#ifdef MATCH_MAY_ALLOCATE /* otherwise, this is global. */ - register_info_type *reg_info; -#endif - - /* The following record the register info as found in the above - variables when we find a match better than any we've seen before. - This happens as we backtrack through the failure points, which in - turn happens only if we have not yet matched the entire string. */ - unsigned best_regs_set = false; -#ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global. */ - const char **best_regstart, **best_regend; -#endif - - /* Logically, this is `best_regend[0]'. But we don't want to have to - allocate space for that if we're not allocating space for anything - else (see below). Also, we never need info about register 0 for - any of the other register vectors, and it seems rather a kludge to - treat `best_regend' differently than the rest. So we keep track of - the end of the best match so far in a separate variable. We - initialize this to NULL so that when we backtrack the first time - and need to test it, it's not garbage. */ - const char *match_end = NULL; - - /* This helps SET_REGS_MATCHED avoid doing redundant work. */ - int set_regs_matched_done = 0; - - /* Used when we pop values we don't care about. */ -#ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global. */ - const char **reg_dummy; - register_info_type *reg_info_dummy; -#endif - -#ifdef DEBUG - /* Counts the total number of registers pushed. */ - unsigned num_regs_pushed = 0; -#endif - - DEBUG_PRINT1 ("\n\nEntering re_match_2.\n"); - - INIT_FAIL_STACK (); - -#ifdef MATCH_MAY_ALLOCATE - /* Do not bother to initialize all the register variables if there are - no groups in the pattern, as it takes a fair amount of time. If - there are groups, we include space for register 0 (the whole - pattern), even though we never use it, since it simplifies the - array indexing. We should fix this. */ - if (bufp->re_nsub) - { - regstart = REGEX_TALLOC (num_regs, const char *); - regend = REGEX_TALLOC (num_regs, const char *); - old_regstart = REGEX_TALLOC (num_regs, const char *); - old_regend = REGEX_TALLOC (num_regs, const char *); - best_regstart = REGEX_TALLOC (num_regs, const char *); - best_regend = REGEX_TALLOC (num_regs, const char *); - reg_info = REGEX_TALLOC (num_regs, register_info_type); - reg_dummy = REGEX_TALLOC (num_regs, const char *); - reg_info_dummy = REGEX_TALLOC (num_regs, register_info_type); - - if (!(regstart && regend && old_regstart && old_regend && reg_info - && best_regstart && best_regend && reg_dummy && reg_info_dummy)) - { - FREE_VARIABLES (); - return -2; - } - } - else - { - /* We must initialize all our variables to NULL, so that - `FREE_VARIABLES' doesn't try to free them. */ - regstart = regend = old_regstart = old_regend = best_regstart - = best_regend = reg_dummy = NULL; - reg_info = reg_info_dummy = (register_info_type *) NULL; - } -#endif /* MATCH_MAY_ALLOCATE */ - - /* The starting position is bogus. */ - if (pos < 0 || pos > size1 + size2) - { - FREE_VARIABLES (); - return -1; - } - - /* Initialize subexpression text positions to -1 to mark ones that no - start_memory/stop_memory has been seen for. Also initialize the - register information struct. */ - for (mcnt = 1; (unsigned) mcnt < num_regs; mcnt++) - { - regstart[mcnt] = regend[mcnt] - = old_regstart[mcnt] = old_regend[mcnt] = REG_UNSET_VALUE; - - REG_MATCH_NULL_STRING_P (reg_info[mcnt]) = MATCH_NULL_UNSET_VALUE; - IS_ACTIVE (reg_info[mcnt]) = 0; - MATCHED_SOMETHING (reg_info[mcnt]) = 0; - EVER_MATCHED_SOMETHING (reg_info[mcnt]) = 0; - } - - /* We move `string1' into `string2' if the latter's empty -- but not if - `string1' is null. */ - if (size2 == 0 && string1 != NULL) - { - string2 = string1; - size2 = size1; - string1 = 0; - size1 = 0; - } - end1 = string1 + size1; - end2 = string2 + size2; - - /* Compute where to stop matching, within the two strings. */ - if (stop <= size1) - { - end_match_1 = string1 + stop; - end_match_2 = string2; - } - else - { - end_match_1 = end1; - end_match_2 = string2 + stop - size1; - } - - /* `p' scans through the pattern as `d' scans through the data. - `dend' is the end of the input string that `d' points within. `d' - is advanced into the following input string whenever necessary, but - this happens before fetching; therefore, at the beginning of the - loop, `d' can be pointing at the end of a string, but it cannot - equal `string2'. */ - if (size1 > 0 && pos <= size1) - { - d = string1 + pos; - dend = end_match_1; - } - else - { - d = string2 + pos - size1; - dend = end_match_2; - } - - DEBUG_PRINT1 ("The compiled pattern is:\n"); - DEBUG_PRINT_COMPILED_PATTERN (bufp, p, pend); - DEBUG_PRINT1 ("The string to match is: `"); - DEBUG_PRINT_DOUBLE_STRING (d, string1, size1, string2, size2); - DEBUG_PRINT1 ("'\n"); - - /* This loops over pattern commands. It exits by returning from the - function if the match is complete, or it drops through if the match - fails at this starting point in the input data. */ - for (;;) - { -#ifdef _LIBC - DEBUG_PRINT2 ("\n%p: ", p); -#else - DEBUG_PRINT2 ("\n0x%x: ", p); -#endif - - if (p == pend) - { /* End of pattern means we might have succeeded. */ - DEBUG_PRINT1 ("end of pattern ... "); - - /* If we haven't matched the entire string, and we want the - longest match, try backtracking. */ - if (d != end_match_2) - { - /* 1 if this match ends in the same string (string1 or string2) - as the best previous match. */ - boolean same_str_p = (FIRST_STRING_P (match_end) - == MATCHING_IN_FIRST_STRING); - /* 1 if this match is the best seen so far. */ - boolean best_match_p; - - /* AIX compiler got confused when this was combined - with the previous declaration. */ - if (same_str_p) - best_match_p = d > match_end; - else - best_match_p = !MATCHING_IN_FIRST_STRING; - - DEBUG_PRINT1 ("backtracking.\n"); - - if (!FAIL_STACK_EMPTY ()) - { /* More failure points to try. */ - - /* If exceeds best match so far, save it. */ - if (!best_regs_set || best_match_p) - { - best_regs_set = true; - match_end = d; - - DEBUG_PRINT1 ("\nSAVING match as best so far.\n"); - - for (mcnt = 1; (unsigned) mcnt < num_regs; mcnt++) - { - best_regstart[mcnt] = regstart[mcnt]; - best_regend[mcnt] = regend[mcnt]; - } - } - goto fail; - } - - /* If no failure points, don't restore garbage. And if - last match is real best match, don't restore second - best one. */ - else if (best_regs_set && !best_match_p) - { - restore_best_regs: - /* Restore best match. It may happen that `dend == - end_match_1' while the restored d is in string2. - For example, the pattern `x.*y.*z' against the - strings `x-' and `y-z-', if the two strings are - not consecutive in memory. */ - DEBUG_PRINT1 ("Restoring best registers.\n"); - - d = match_end; - dend = ((d >= string1 && d <= end1) - ? end_match_1 : end_match_2); - - for (mcnt = 1; (unsigned) mcnt < num_regs; mcnt++) - { - regstart[mcnt] = best_regstart[mcnt]; - regend[mcnt] = best_regend[mcnt]; - } - } - } /* d != end_match_2 */ - - succeed_label: - DEBUG_PRINT1 ("Accepting match.\n"); - - /* If caller wants register contents data back, do it. */ - if (regs && !bufp->no_sub) - { - /* Have the register data arrays been allocated? */ - if (bufp->regs_allocated == REGS_UNALLOCATED) - { /* No. So allocate them with malloc. We need one - extra element beyond `num_regs' for the `-1' marker - GNU code uses. */ - regs->num_regs = MAX (RE_NREGS, num_regs + 1); - regs->start = TALLOC (regs->num_regs, regoff_t); - regs->end = TALLOC (regs->num_regs, regoff_t); - if (regs->start == NULL || regs->end == NULL) - { - FREE_VARIABLES (); - return -2; - } - bufp->regs_allocated = REGS_REALLOCATE; - } - else if (bufp->regs_allocated == REGS_REALLOCATE) - { /* Yes. If we need more elements than were already - allocated, reallocate them. If we need fewer, just - leave it alone. */ - if (regs->num_regs < num_regs + 1) - { - regs->num_regs = num_regs + 1; - RETALLOC (regs->start, regs->num_regs, regoff_t); - RETALLOC (regs->end, regs->num_regs, regoff_t); - if (regs->start == NULL || regs->end == NULL) - { - FREE_VARIABLES (); - return -2; - } - } - } - else - { - /* These braces fend off a "empty body in an else-statement" - warning under GCC when assert expands to nothing. */ - assert (bufp->regs_allocated == REGS_FIXED); - } - - /* Convert the pointer data in `regstart' and `regend' to - indices. Register zero has to be set differently, - since we haven't kept track of any info for it. */ - if (regs->num_regs > 0) - { - regs->start[0] = pos; - regs->end[0] = (MATCHING_IN_FIRST_STRING - ? ((regoff_t) (d - string1)) - : ((regoff_t) (d - string2 + size1))); - } - - /* Go through the first `min (num_regs, regs->num_regs)' - registers, since that is all we initialized. */ - for (mcnt = 1; (unsigned) mcnt < MIN (num_regs, regs->num_regs); - mcnt++) - { - if (REG_UNSET (regstart[mcnt]) || REG_UNSET (regend[mcnt])) - regs->start[mcnt] = regs->end[mcnt] = -1; - else - { - regs->start[mcnt] - = (regoff_t) POINTER_TO_OFFSET (regstart[mcnt]); - regs->end[mcnt] - = (regoff_t) POINTER_TO_OFFSET (regend[mcnt]); - } - } - - /* If the regs structure we return has more elements than - were in the pattern, set the extra elements to -1. If - we (re)allocated the registers, this is the case, - because we always allocate enough to have at least one - -1 at the end. */ - for (mcnt = num_regs; (unsigned) mcnt < regs->num_regs; mcnt++) - regs->start[mcnt] = regs->end[mcnt] = -1; - } /* regs && !bufp->no_sub */ - - DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n", - nfailure_points_pushed, nfailure_points_popped, - nfailure_points_pushed - nfailure_points_popped); - DEBUG_PRINT2 ("%u registers pushed.\n", num_regs_pushed); - - mcnt = d - pos - (MATCHING_IN_FIRST_STRING - ? string1 - : string2 - size1); - - DEBUG_PRINT2 ("Returning %d from re_match_2.\n", mcnt); - - FREE_VARIABLES (); - return mcnt; - } - - /* Otherwise match next pattern command. */ - switch (SWITCH_ENUM_CAST ((re_opcode_t) *p++)) - { - /* Ignore these. Used to ignore the n of succeed_n's which - currently have n == 0. */ - case no_op: - DEBUG_PRINT1 ("EXECUTING no_op.\n"); - break; - - case succeed: - DEBUG_PRINT1 ("EXECUTING succeed.\n"); - goto succeed_label; - - /* Match the next n pattern characters exactly. The following - byte in the pattern defines n, and the n bytes after that - are the characters to match. */ - case exactn: - mcnt = *p++; - DEBUG_PRINT2 ("EXECUTING exactn %d.\n", mcnt); - - /* This is written out as an if-else so we don't waste time - testing `translate' inside the loop. */ - if (translate) - { - do - { - PREFETCH (); - if ((unsigned char) translate[(unsigned char) *d++] - != (unsigned char) *p++) - goto fail; - } - while (--mcnt); - } - else - { - do - { - PREFETCH (); - if (*d++ != (char) *p++) goto fail; - } - while (--mcnt); - } - SET_REGS_MATCHED (); - break; - - - /* Match any character except possibly a newline or a null. */ - case anychar: - DEBUG_PRINT1 ("EXECUTING anychar.\n"); - - PREFETCH (); - - if ((!(bufp->syntax & RE_DOT_NEWLINE) && TRANSLATE (*d) == '\n') - || (bufp->syntax & RE_DOT_NOT_NULL && TRANSLATE (*d) == '\000')) - goto fail; - - SET_REGS_MATCHED (); - DEBUG_PRINT2 (" Matched `%d'.\n", *d); - d++; - break; - - - case charset: - case charset_not: - { - register unsigned char c; - boolean not = (re_opcode_t) *(p - 1) == charset_not; - - DEBUG_PRINT2 ("EXECUTING charset%s.\n", not ? "_not" : ""); - - PREFETCH (); - c = TRANSLATE (*d); /* The character to match. */ - - /* Cast to `unsigned' instead of `unsigned char' in case the - bit list is a full 32 bytes long. */ - if (c < (unsigned) (*p * BYTEWIDTH) - && p[1 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH))) - not = !not; - - p += 1 + *p; - - if (!not) goto fail; - - SET_REGS_MATCHED (); - d++; - break; - } - - - /* The beginning of a group is represented by start_memory. - The arguments are the register number in the next byte, and the - number of groups inner to this one in the next. The text - matched within the group is recorded (in the internal - registers data structure) under the register number. */ - case start_memory: - DEBUG_PRINT3 ("EXECUTING start_memory %d (%d):\n", *p, p[1]); - - /* Find out if this group can match the empty string. */ - p1 = p; /* To send to group_match_null_string_p. */ - - if (REG_MATCH_NULL_STRING_P (reg_info[*p]) == MATCH_NULL_UNSET_VALUE) - REG_MATCH_NULL_STRING_P (reg_info[*p]) - = group_match_null_string_p (&p1, pend, reg_info); - - /* Save the position in the string where we were the last time - we were at this open-group operator in case the group is - operated upon by a repetition operator, e.g., with `(a*)*b' - against `ab'; then we want to ignore where we are now in - the string in case this attempt to match fails. */ - old_regstart[*p] = REG_MATCH_NULL_STRING_P (reg_info[*p]) - ? REG_UNSET (regstart[*p]) ? d : regstart[*p] - : regstart[*p]; - DEBUG_PRINT2 (" old_regstart: %d\n", - POINTER_TO_OFFSET (old_regstart[*p])); - - regstart[*p] = d; - DEBUG_PRINT2 (" regstart: %d\n", POINTER_TO_OFFSET (regstart[*p])); - - IS_ACTIVE (reg_info[*p]) = 1; - MATCHED_SOMETHING (reg_info[*p]) = 0; - - /* Clear this whenever we change the register activity status. */ - set_regs_matched_done = 0; - - /* This is the new highest active register. */ - highest_active_reg = *p; - - /* If nothing was active before, this is the new lowest active - register. */ - if (lowest_active_reg == NO_LOWEST_ACTIVE_REG) - lowest_active_reg = *p; - - /* Move past the register number and inner group count. */ - p += 2; - just_past_start_mem = p; - - break; - - - /* The stop_memory opcode represents the end of a group. Its - arguments are the same as start_memory's: the register - number, and the number of inner groups. */ - case stop_memory: - DEBUG_PRINT3 ("EXECUTING stop_memory %d (%d):\n", *p, p[1]); - - /* We need to save the string position the last time we were at - this close-group operator in case the group is operated - upon by a repetition operator, e.g., with `((a*)*(b*)*)*' - against `aba'; then we want to ignore where we are now in - the string in case this attempt to match fails. */ - old_regend[*p] = REG_MATCH_NULL_STRING_P (reg_info[*p]) - ? REG_UNSET (regend[*p]) ? d : regend[*p] - : regend[*p]; - DEBUG_PRINT2 (" old_regend: %d\n", - POINTER_TO_OFFSET (old_regend[*p])); - - regend[*p] = d; - DEBUG_PRINT2 (" regend: %d\n", POINTER_TO_OFFSET (regend[*p])); - - /* This register isn't active anymore. */ - IS_ACTIVE (reg_info[*p]) = 0; - - /* Clear this whenever we change the register activity status. */ - set_regs_matched_done = 0; - - /* If this was the only register active, nothing is active - anymore. */ - if (lowest_active_reg == highest_active_reg) - { - lowest_active_reg = NO_LOWEST_ACTIVE_REG; - highest_active_reg = NO_HIGHEST_ACTIVE_REG; - } - else - { /* We must scan for the new highest active register, since - it isn't necessarily one less than now: consider - (a(b)c(d(e)f)g). When group 3 ends, after the f), the - new highest active register is 1. */ - unsigned char r = *p - 1; - while (r > 0 && !IS_ACTIVE (reg_info[r])) - r--; - - /* If we end up at register zero, that means that we saved - the registers as the result of an `on_failure_jump', not - a `start_memory', and we jumped to past the innermost - `stop_memory'. For example, in ((.)*) we save - registers 1 and 2 as a result of the *, but when we pop - back to the second ), we are at the stop_memory 1. - Thus, nothing is active. */ - if (r == 0) - { - lowest_active_reg = NO_LOWEST_ACTIVE_REG; - highest_active_reg = NO_HIGHEST_ACTIVE_REG; - } - else - highest_active_reg = r; - } - - /* If just failed to match something this time around with a - group that's operated on by a repetition operator, try to - force exit from the ``loop'', and restore the register - information for this group that we had before trying this - last match. */ - if ((!MATCHED_SOMETHING (reg_info[*p]) - || just_past_start_mem == p - 1) - && (p + 2) < pend) - { - boolean is_a_jump_n = false; - - p1 = p + 2; - mcnt = 0; - switch ((re_opcode_t) *p1++) - { - case jump_n: - is_a_jump_n = true; - case pop_failure_jump: - case maybe_pop_jump: - case jump: - case dummy_failure_jump: - EXTRACT_NUMBER_AND_INCR (mcnt, p1); - if (is_a_jump_n) - p1 += 2; - break; - - default: - /* do nothing */ ; - } - p1 += mcnt; - - /* If the next operation is a jump backwards in the pattern - to an on_failure_jump right before the start_memory - corresponding to this stop_memory, exit from the loop - by forcing a failure after pushing on the stack the - on_failure_jump's jump in the pattern, and d. */ - if (mcnt < 0 && (re_opcode_t) *p1 == on_failure_jump - && (re_opcode_t) p1[3] == start_memory && p1[4] == *p) - { - /* If this group ever matched anything, then restore - what its registers were before trying this last - failed match, e.g., with `(a*)*b' against `ab' for - regstart[1], and, e.g., with `((a*)*(b*)*)*' - against `aba' for regend[3]. - - Also restore the registers for inner groups for, - e.g., `((a*)(b*))*' against `aba' (register 3 would - otherwise get trashed). */ - - if (EVER_MATCHED_SOMETHING (reg_info[*p])) - { - unsigned r; - - EVER_MATCHED_SOMETHING (reg_info[*p]) = 0; - - /* Restore this and inner groups' (if any) registers. */ - for (r = *p; r < (unsigned) *p + (unsigned) *(p + 1); - r++) - { - regstart[r] = old_regstart[r]; - - /* xx why this test? */ - if (old_regend[r] >= regstart[r]) - regend[r] = old_regend[r]; - } - } - p1++; - EXTRACT_NUMBER_AND_INCR (mcnt, p1); - PUSH_FAILURE_POINT (p1 + mcnt, d, -2); - - goto fail; - } - } - - /* Move past the register number and the inner group count. */ - p += 2; - break; - - - /* \<digit> has been turned into a `duplicate' command which is - followed by the numeric value of <digit> as the register number. */ - case duplicate: - { - register const char *d2, *dend2; - int regno = *p++; /* Get which register to match against. */ - DEBUG_PRINT2 ("EXECUTING duplicate %d.\n", regno); - - /* Can't back reference a group which we've never matched. */ - if (REG_UNSET (regstart[regno]) || REG_UNSET (regend[regno])) - goto fail; - - /* Where in input to try to start matching. */ - d2 = regstart[regno]; - - /* Where to stop matching; if both the place to start and - the place to stop matching are in the same string, then - set to the place to stop, otherwise, for now have to use - the end of the first string. */ - - dend2 = ((FIRST_STRING_P (regstart[regno]) - == FIRST_STRING_P (regend[regno])) - ? regend[regno] : end_match_1); - for (;;) - { - /* If necessary, advance to next segment in register - contents. */ - while (d2 == dend2) - { - if (dend2 == end_match_2) break; - if (dend2 == regend[regno]) break; - - /* End of string1 => advance to string2. */ - d2 = string2; - dend2 = regend[regno]; - } - /* At end of register contents => success */ - if (d2 == dend2) break; - - /* If necessary, advance to next segment in data. */ - PREFETCH (); - - /* How many characters left in this segment to match. */ - mcnt = dend - d; - - /* Want how many consecutive characters we can match in - one shot, so, if necessary, adjust the count. */ - if (mcnt > dend2 - d2) - mcnt = dend2 - d2; - - /* Compare that many; failure if mismatch, else move - past them. */ - if (translate - ? bcmp_translate (d, d2, mcnt, translate) - : memcmp (d, d2, mcnt)) - goto fail; - d += mcnt, d2 += mcnt; - - /* Do this because we've match some characters. */ - SET_REGS_MATCHED (); - } - } - break; - - - /* begline matches the empty string at the beginning of the string - (unless `not_bol' is set in `bufp'), and, if - `newline_anchor' is set, after newlines. */ - case begline: - DEBUG_PRINT1 ("EXECUTING begline.\n"); - - if (AT_STRINGS_BEG (d)) - { - if (!bufp->not_bol) break; - } - else if (d[-1] == '\n' && bufp->newline_anchor) - { - break; - } - /* In all other cases, we fail. */ - goto fail; - - - /* endline is the dual of begline. */ - case endline: - DEBUG_PRINT1 ("EXECUTING endline.\n"); - - if (AT_STRINGS_END (d)) - { - if (!bufp->not_eol) break; - } - - /* We have to ``prefetch'' the next character. */ - else if ((d == end1 ? *string2 : *d) == '\n' - && bufp->newline_anchor) - { - break; - } - goto fail; - - - /* Match at the very beginning of the data. */ - case begbuf: - DEBUG_PRINT1 ("EXECUTING begbuf.\n"); - if (AT_STRINGS_BEG (d)) - break; - goto fail; - - - /* Match at the very end of the data. */ - case endbuf: - DEBUG_PRINT1 ("EXECUTING endbuf.\n"); - if (AT_STRINGS_END (d)) - break; - goto fail; - - - /* on_failure_keep_string_jump is used to optimize `.*\n'. It - pushes NULL as the value for the string on the stack. Then - `pop_failure_point' will keep the current value for the - string, instead of restoring it. To see why, consider - matching `foo\nbar' against `.*\n'. The .* matches the foo; - then the . fails against the \n. But the next thing we want - to do is match the \n against the \n; if we restored the - string value, we would be back at the foo. - - Because this is used only in specific cases, we don't need to - check all the things that `on_failure_jump' does, to make - sure the right things get saved on the stack. Hence we don't - share its code. The only reason to push anything on the - stack at all is that otherwise we would have to change - `anychar's code to do something besides goto fail in this - case; that seems worse than this. */ - case on_failure_keep_string_jump: - DEBUG_PRINT1 ("EXECUTING on_failure_keep_string_jump"); - - EXTRACT_NUMBER_AND_INCR (mcnt, p); -#ifdef _LIBC - DEBUG_PRINT3 (" %d (to %p):\n", mcnt, p + mcnt); -#else - DEBUG_PRINT3 (" %d (to 0x%x):\n", mcnt, p + mcnt); -#endif - - PUSH_FAILURE_POINT (p + mcnt, NULL, -2); - break; - - - /* Uses of on_failure_jump: - - Each alternative starts with an on_failure_jump that points - to the beginning of the next alternative. Each alternative - except the last ends with a jump that in effect jumps past - the rest of the alternatives. (They really jump to the - ending jump of the following alternative, because tensioning - these jumps is a hassle.) - - Repeats start with an on_failure_jump that points past both - the repetition text and either the following jump or - pop_failure_jump back to this on_failure_jump. */ - case on_failure_jump: - on_failure: - DEBUG_PRINT1 ("EXECUTING on_failure_jump"); - - EXTRACT_NUMBER_AND_INCR (mcnt, p); -#ifdef _LIBC - DEBUG_PRINT3 (" %d (to %p)", mcnt, p + mcnt); -#else - DEBUG_PRINT3 (" %d (to 0x%x)", mcnt, p + mcnt); -#endif - - /* If this on_failure_jump comes right before a group (i.e., - the original * applied to a group), save the information - for that group and all inner ones, so that if we fail back - to this point, the group's information will be correct. - For example, in \(a*\)*\1, we need the preceding group, - and in \(zz\(a*\)b*\)\2, we need the inner group. */ - - /* We can't use `p' to check ahead because we push - a failure point to `p + mcnt' after we do this. */ - p1 = p; - - /* We need to skip no_op's before we look for the - start_memory in case this on_failure_jump is happening as - the result of a completed succeed_n, as in \(a\)\{1,3\}b\1 - against aba. */ - while (p1 < pend && (re_opcode_t) *p1 == no_op) - p1++; - - if (p1 < pend && (re_opcode_t) *p1 == start_memory) - { - /* We have a new highest active register now. This will - get reset at the start_memory we are about to get to, - but we will have saved all the registers relevant to - this repetition op, as described above. */ - highest_active_reg = *(p1 + 1) + *(p1 + 2); - if (lowest_active_reg == NO_LOWEST_ACTIVE_REG) - lowest_active_reg = *(p1 + 1); - } - - DEBUG_PRINT1 (":\n"); - PUSH_FAILURE_POINT (p + mcnt, d, -2); - break; - - - /* A smart repeat ends with `maybe_pop_jump'. - We change it to either `pop_failure_jump' or `jump'. */ - case maybe_pop_jump: - EXTRACT_NUMBER_AND_INCR (mcnt, p); - DEBUG_PRINT2 ("EXECUTING maybe_pop_jump %d.\n", mcnt); - { - register unsigned char *p2 = p; - - /* Compare the beginning of the repeat with what in the - pattern follows its end. If we can establish that there - is nothing that they would both match, i.e., that we - would have to backtrack because of (as in, e.g., `a*a') - then we can change to pop_failure_jump, because we'll - never have to backtrack. - - This is not true in the case of alternatives: in - `(a|ab)*' we do need to backtrack to the `ab' alternative - (e.g., if the string was `ab'). But instead of trying to - detect that here, the alternative has put on a dummy - failure point which is what we will end up popping. */ - - /* Skip over open/close-group commands. - If what follows this loop is a ...+ construct, - look at what begins its body, since we will have to - match at least one of that. */ - while (1) - { - if (p2 + 2 < pend - && ((re_opcode_t) *p2 == stop_memory - || (re_opcode_t) *p2 == start_memory)) - p2 += 3; - else if (p2 + 6 < pend - && (re_opcode_t) *p2 == dummy_failure_jump) - p2 += 6; - else - break; - } - - p1 = p + mcnt; - /* p1[0] ... p1[2] are the `on_failure_jump' corresponding - to the `maybe_finalize_jump' of this case. Examine what - follows. */ - - /* If we're at the end of the pattern, we can change. */ - if (p2 == pend) - { - /* Consider what happens when matching ":\(.*\)" - against ":/". I don't really understand this code - yet. */ - p[-3] = (unsigned char) pop_failure_jump; - DEBUG_PRINT1 - (" End of pattern: change to `pop_failure_jump'.\n"); - } - - else if ((re_opcode_t) *p2 == exactn - || (bufp->newline_anchor && (re_opcode_t) *p2 == endline)) - { - register unsigned char c - = *p2 == (unsigned char) endline ? '\n' : p2[2]; - - if ((re_opcode_t) p1[3] == exactn && p1[5] != c) - { - p[-3] = (unsigned char) pop_failure_jump; - DEBUG_PRINT3 (" %c != %c => pop_failure_jump.\n", - c, p1[5]); - } - - else if ((re_opcode_t) p1[3] == charset - || (re_opcode_t) p1[3] == charset_not) - { - int not = (re_opcode_t) p1[3] == charset_not; - - if (c < (unsigned char) (p1[4] * BYTEWIDTH) - && p1[5 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH))) - not = !not; - - /* `not' is equal to 1 if c would match, which means - that we can't change to pop_failure_jump. */ - if (!not) - { - p[-3] = (unsigned char) pop_failure_jump; - DEBUG_PRINT1 (" No match => pop_failure_jump.\n"); - } - } - } - else if ((re_opcode_t) *p2 == charset) - { -#ifdef DEBUG - register unsigned char c - = *p2 == (unsigned char) endline ? '\n' : p2[2]; -#endif - -#if 0 - if ((re_opcode_t) p1[3] == exactn - && ! ((int) p2[1] * BYTEWIDTH > (int) p1[5] - && (p2[2 + p1[5] / BYTEWIDTH] - & (1 << (p1[5] % BYTEWIDTH))))) -#else - if ((re_opcode_t) p1[3] == exactn - && ! ((int) p2[1] * BYTEWIDTH > (int) p1[4] - && (p2[2 + p1[4] / BYTEWIDTH] - & (1 << (p1[4] % BYTEWIDTH))))) -#endif - { - p[-3] = (unsigned char) pop_failure_jump; - DEBUG_PRINT3 (" %c != %c => pop_failure_jump.\n", - c, p1[5]); - } - - else if ((re_opcode_t) p1[3] == charset_not) - { - int idx; - /* We win if the charset_not inside the loop - lists every character listed in the charset after. */ - for (idx = 0; idx < (int) p2[1]; idx++) - if (! (p2[2 + idx] == 0 - || (idx < (int) p1[4] - && ((p2[2 + idx] & ~ p1[5 + idx]) == 0)))) - break; - - if (idx == p2[1]) - { - p[-3] = (unsigned char) pop_failure_jump; - DEBUG_PRINT1 (" No match => pop_failure_jump.\n"); - } - } - else if ((re_opcode_t) p1[3] == charset) - { - int idx; - /* We win if the charset inside the loop - has no overlap with the one after the loop. */ - for (idx = 0; - idx < (int) p2[1] && idx < (int) p1[4]; - idx++) - if ((p2[2 + idx] & p1[5 + idx]) != 0) - break; - - if (idx == p2[1] || idx == p1[4]) - { - p[-3] = (unsigned char) pop_failure_jump; - DEBUG_PRINT1 (" No match => pop_failure_jump.\n"); - } - } - } - } - p -= 2; /* Point at relative address again. */ - if ((re_opcode_t) p[-1] != pop_failure_jump) - { - p[-1] = (unsigned char) jump; - DEBUG_PRINT1 (" Match => jump.\n"); - goto unconditional_jump; - } - /* Note fall through. */ - - - /* The end of a simple repeat has a pop_failure_jump back to - its matching on_failure_jump, where the latter will push a - failure point. The pop_failure_jump takes off failure - points put on by this pop_failure_jump's matching - on_failure_jump; we got through the pattern to here from the - matching on_failure_jump, so didn't fail. */ - case pop_failure_jump: - { - /* We need to pass separate storage for the lowest and - highest registers, even though we don't care about the - actual values. Otherwise, we will restore only one - register from the stack, since lowest will == highest in - `pop_failure_point'. */ - active_reg_t dummy_low_reg, dummy_high_reg; - unsigned char *pdummy; - const char *sdummy; - - DEBUG_PRINT1 ("EXECUTING pop_failure_jump.\n"); - POP_FAILURE_POINT (sdummy, pdummy, - dummy_low_reg, dummy_high_reg, - reg_dummy, reg_dummy, reg_info_dummy); - } - /* Note fall through. */ - - unconditional_jump: -#ifdef _LIBC - DEBUG_PRINT2 ("\n%p: ", p); -#else - DEBUG_PRINT2 ("\n0x%x: ", p); -#endif - /* Note fall through. */ - - /* Unconditionally jump (without popping any failure points). */ - case jump: - EXTRACT_NUMBER_AND_INCR (mcnt, p); /* Get the amount to jump. */ - DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt); - p += mcnt; /* Do the jump. */ -#ifdef _LIBC - DEBUG_PRINT2 ("(to %p).\n", p); -#else - DEBUG_PRINT2 ("(to 0x%x).\n", p); -#endif - break; - - - /* We need this opcode so we can detect where alternatives end - in `group_match_null_string_p' et al. */ - case jump_past_alt: - DEBUG_PRINT1 ("EXECUTING jump_past_alt.\n"); - goto unconditional_jump; - - - /* Normally, the on_failure_jump pushes a failure point, which - then gets popped at pop_failure_jump. We will end up at - pop_failure_jump, also, and with a pattern of, say, `a+', we - are skipping over the on_failure_jump, so we have to push - something meaningless for pop_failure_jump to pop. */ - case dummy_failure_jump: - DEBUG_PRINT1 ("EXECUTING dummy_failure_jump.\n"); - /* It doesn't matter what we push for the string here. What - the code at `fail' tests is the value for the pattern. */ - PUSH_FAILURE_POINT (NULL, NULL, -2); - goto unconditional_jump; - - - /* At the end of an alternative, we need to push a dummy failure - point in case we are followed by a `pop_failure_jump', because - we don't want the failure point for the alternative to be - popped. For example, matching `(a|ab)*' against `aab' - requires that we match the `ab' alternative. */ - case push_dummy_failure: - DEBUG_PRINT1 ("EXECUTING push_dummy_failure.\n"); - /* See comments just above at `dummy_failure_jump' about the - two zeroes. */ - PUSH_FAILURE_POINT (NULL, NULL, -2); - break; - - /* Have to succeed matching what follows at least n times. - After that, handle like `on_failure_jump'. */ - case succeed_n: - EXTRACT_NUMBER (mcnt, p + 2); - DEBUG_PRINT2 ("EXECUTING succeed_n %d.\n", mcnt); - - assert (mcnt >= 0); - /* Originally, this is how many times we HAVE to succeed. */ - if (mcnt > 0) - { - mcnt--; - p += 2; - STORE_NUMBER_AND_INCR (p, mcnt); -#ifdef _LIBC - DEBUG_PRINT3 (" Setting %p to %d.\n", p - 2, mcnt); -#else - DEBUG_PRINT3 (" Setting 0x%x to %d.\n", p - 2, mcnt); -#endif - } - else if (mcnt == 0) - { -#ifdef _LIBC - DEBUG_PRINT2 (" Setting two bytes from %p to no_op.\n", p+2); -#else - DEBUG_PRINT2 (" Setting two bytes from 0x%x to no_op.\n", p+2); -#endif - p[2] = (unsigned char) no_op; - p[3] = (unsigned char) no_op; - goto on_failure; - } - break; - - case jump_n: - EXTRACT_NUMBER (mcnt, p + 2); - DEBUG_PRINT2 ("EXECUTING jump_n %d.\n", mcnt); - - /* Originally, this is how many times we CAN jump. */ - if (mcnt) - { - mcnt--; - STORE_NUMBER (p + 2, mcnt); -#ifdef _LIBC - DEBUG_PRINT3 (" Setting %p to %d.\n", p + 2, mcnt); -#else - DEBUG_PRINT3 (" Setting 0x%x to %d.\n", p + 2, mcnt); -#endif - goto unconditional_jump; - } - /* If don't have to jump any more, skip over the rest of command. */ - else - p += 4; - break; - - case set_number_at: - { - DEBUG_PRINT1 ("EXECUTING set_number_at.\n"); - - EXTRACT_NUMBER_AND_INCR (mcnt, p); - p1 = p + mcnt; - EXTRACT_NUMBER_AND_INCR (mcnt, p); -#ifdef _LIBC - DEBUG_PRINT3 (" Setting %p to %d.\n", p1, mcnt); -#else - DEBUG_PRINT3 (" Setting 0x%x to %d.\n", p1, mcnt); -#endif - STORE_NUMBER (p1, mcnt); - break; - } - -#if 0 - /* The DEC Alpha C compiler 3.x generates incorrect code for the - test WORDCHAR_P (d - 1) != WORDCHAR_P (d) in the expansion of - AT_WORD_BOUNDARY, so this code is disabled. Expanding the - macro and introducing temporary variables works around the bug. */ - - case wordbound: - DEBUG_PRINT1 ("EXECUTING wordbound.\n"); - if (AT_WORD_BOUNDARY (d)) - break; - goto fail; - - case notwordbound: - DEBUG_PRINT1 ("EXECUTING notwordbound.\n"); - if (AT_WORD_BOUNDARY (d)) - goto fail; - break; -#else - case wordbound: - { - boolean prevchar, thischar; - - DEBUG_PRINT1 ("EXECUTING wordbound.\n"); - if (AT_STRINGS_BEG (d) || AT_STRINGS_END (d)) - break; - - prevchar = WORDCHAR_P (d - 1); - thischar = WORDCHAR_P (d); - if (prevchar != thischar) - break; - goto fail; - } - - case notwordbound: - { - boolean prevchar, thischar; - - DEBUG_PRINT1 ("EXECUTING notwordbound.\n"); - if (AT_STRINGS_BEG (d) || AT_STRINGS_END (d)) - goto fail; - - prevchar = WORDCHAR_P (d - 1); - thischar = WORDCHAR_P (d); - if (prevchar != thischar) - goto fail; - break; - } -#endif - - case wordbeg: - DEBUG_PRINT1 ("EXECUTING wordbeg.\n"); - if (WORDCHAR_P (d) && (AT_STRINGS_BEG (d) || !WORDCHAR_P (d - 1))) - break; - goto fail; - - case wordend: - DEBUG_PRINT1 ("EXECUTING wordend.\n"); - if (!AT_STRINGS_BEG (d) && WORDCHAR_P (d - 1) - && (!WORDCHAR_P (d) || AT_STRINGS_END (d))) - break; - goto fail; - -#ifdef emacs - case before_dot: - DEBUG_PRINT1 ("EXECUTING before_dot.\n"); - if (PTR_CHAR_POS ((unsigned char *) d) >= point) - goto fail; - break; - - case at_dot: - DEBUG_PRINT1 ("EXECUTING at_dot.\n"); - if (PTR_CHAR_POS ((unsigned char *) d) != point) - goto fail; - break; - - case after_dot: - DEBUG_PRINT1 ("EXECUTING after_dot.\n"); - if (PTR_CHAR_POS ((unsigned char *) d) <= point) - goto fail; - break; - - case syntaxspec: - DEBUG_PRINT2 ("EXECUTING syntaxspec %d.\n", mcnt); - mcnt = *p++; - goto matchsyntax; - - case wordchar: - DEBUG_PRINT1 ("EXECUTING Emacs wordchar.\n"); - mcnt = (int) Sword; - matchsyntax: - PREFETCH (); - /* Can't use *d++ here; SYNTAX may be an unsafe macro. */ - d++; - if (SYNTAX (d[-1]) != (enum syntaxcode) mcnt) - goto fail; - SET_REGS_MATCHED (); - break; - - case notsyntaxspec: - DEBUG_PRINT2 ("EXECUTING notsyntaxspec %d.\n", mcnt); - mcnt = *p++; - goto matchnotsyntax; - - case notwordchar: - DEBUG_PRINT1 ("EXECUTING Emacs notwordchar.\n"); - mcnt = (int) Sword; - matchnotsyntax: - PREFETCH (); - /* Can't use *d++ here; SYNTAX may be an unsafe macro. */ - d++; - if (SYNTAX (d[-1]) == (enum syntaxcode) mcnt) - goto fail; - SET_REGS_MATCHED (); - break; - -#else /* not emacs */ - case wordchar: - DEBUG_PRINT1 ("EXECUTING non-Emacs wordchar.\n"); - PREFETCH (); - if (!WORDCHAR_P (d)) - goto fail; - SET_REGS_MATCHED (); - d++; - break; - - case notwordchar: - DEBUG_PRINT1 ("EXECUTING non-Emacs notwordchar.\n"); - PREFETCH (); - if (WORDCHAR_P (d)) - goto fail; - SET_REGS_MATCHED (); - d++; - break; -#endif /* not emacs */ - - default: - abort (); - } - continue; /* Successfully executed one pattern command; keep going. */ - - - /* We goto here if a matching operation fails. */ - fail: - if (!FAIL_STACK_EMPTY ()) - { /* A restart point is known. Restore to that state. */ - DEBUG_PRINT1 ("\nFAIL:\n"); - POP_FAILURE_POINT (d, p, - lowest_active_reg, highest_active_reg, - regstart, regend, reg_info); - - /* If this failure point is a dummy, try the next one. */ - if (!p) - goto fail; - - /* If we failed to the end of the pattern, don't examine *p. */ - assert (p <= pend); - if (p < pend) - { - boolean is_a_jump_n = false; - - /* If failed to a backwards jump that's part of a repetition - loop, need to pop this failure point and use the next one. */ - switch ((re_opcode_t) *p) - { - case jump_n: - is_a_jump_n = true; - case maybe_pop_jump: - case pop_failure_jump: - case jump: - p1 = p + 1; - EXTRACT_NUMBER_AND_INCR (mcnt, p1); - p1 += mcnt; - - if ((is_a_jump_n && (re_opcode_t) *p1 == succeed_n) - || (!is_a_jump_n - && (re_opcode_t) *p1 == on_failure_jump)) - goto fail; - break; - default: - /* do nothing */ ; - } - } - - if (d >= string1 && d <= end1) - dend = end_match_1; - } - else - break; /* Matching at this starting point really fails. */ - } /* for (;;) */ - - if (best_regs_set) - goto restore_best_regs; - - FREE_VARIABLES (); - - return -1; /* Failure to match. */ -} /* re_match_2 */ - -/* Subroutine definitions for re_match_2. */ - - -/* We are passed P pointing to a register number after a start_memory. - - Return true if the pattern up to the corresponding stop_memory can - match the empty string, and false otherwise. - - If we find the matching stop_memory, sets P to point to one past its number. - Otherwise, sets P to an undefined byte less than or equal to END. - - We don't handle duplicates properly (yet). */ - -static boolean -group_match_null_string_p (p, end, reg_info) - unsigned char **p, *end; - register_info_type *reg_info; -{ - int mcnt; - /* Point to after the args to the start_memory. */ - unsigned char *p1 = *p + 2; - - while (p1 < end) - { - /* Skip over opcodes that can match nothing, and return true or - false, as appropriate, when we get to one that can't, or to the - matching stop_memory. */ - - switch ((re_opcode_t) *p1) - { - /* Could be either a loop or a series of alternatives. */ - case on_failure_jump: - p1++; - EXTRACT_NUMBER_AND_INCR (mcnt, p1); - - /* If the next operation is not a jump backwards in the - pattern. */ - - if (mcnt >= 0) - { - /* Go through the on_failure_jumps of the alternatives, - seeing if any of the alternatives cannot match nothing. - The last alternative starts with only a jump, - whereas the rest start with on_failure_jump and end - with a jump, e.g., here is the pattern for `a|b|c': - - /on_failure_jump/0/6/exactn/1/a/jump_past_alt/0/6 - /on_failure_jump/0/6/exactn/1/b/jump_past_alt/0/3 - /exactn/1/c - - So, we have to first go through the first (n-1) - alternatives and then deal with the last one separately. */ - - - /* Deal with the first (n-1) alternatives, which start - with an on_failure_jump (see above) that jumps to right - past a jump_past_alt. */ - - while ((re_opcode_t) p1[mcnt-3] == jump_past_alt) - { - /* `mcnt' holds how many bytes long the alternative - is, including the ending `jump_past_alt' and - its number. */ - - if (!alt_match_null_string_p (p1, p1 + mcnt - 3, - reg_info)) - return false; - - /* Move to right after this alternative, including the - jump_past_alt. */ - p1 += mcnt; - - /* Break if it's the beginning of an n-th alternative - that doesn't begin with an on_failure_jump. */ - if ((re_opcode_t) *p1 != on_failure_jump) - break; - - /* Still have to check that it's not an n-th - alternative that starts with an on_failure_jump. */ - p1++; - EXTRACT_NUMBER_AND_INCR (mcnt, p1); - if ((re_opcode_t) p1[mcnt-3] != jump_past_alt) - { - /* Get to the beginning of the n-th alternative. */ - p1 -= 3; - break; - } - } - - /* Deal with the last alternative: go back and get number - of the `jump_past_alt' just before it. `mcnt' contains - the length of the alternative. */ - EXTRACT_NUMBER (mcnt, p1 - 2); - - if (!alt_match_null_string_p (p1, p1 + mcnt, reg_info)) - return false; - - p1 += mcnt; /* Get past the n-th alternative. */ - } /* if mcnt > 0 */ - break; - - - case stop_memory: - assert (p1[1] == **p); - *p = p1 + 2; - return true; - - - default: - if (!common_op_match_null_string_p (&p1, end, reg_info)) - return false; - } - } /* while p1 < end */ - - return false; -} /* group_match_null_string_p */ - - -/* Similar to group_match_null_string_p, but doesn't deal with alternatives: - It expects P to be the first byte of a single alternative and END one - byte past the last. The alternative can contain groups. */ - -static boolean -alt_match_null_string_p (p, end, reg_info) - unsigned char *p, *end; - register_info_type *reg_info; -{ - int mcnt; - unsigned char *p1 = p; - - while (p1 < end) - { - /* Skip over opcodes that can match nothing, and break when we get - to one that can't. */ - - switch ((re_opcode_t) *p1) - { - /* It's a loop. */ - case on_failure_jump: - p1++; - EXTRACT_NUMBER_AND_INCR (mcnt, p1); - p1 += mcnt; - break; - - default: - if (!common_op_match_null_string_p (&p1, end, reg_info)) - return false; - } - } /* while p1 < end */ - - return true; -} /* alt_match_null_string_p */ - - -/* Deals with the ops common to group_match_null_string_p and - alt_match_null_string_p. - - Sets P to one after the op and its arguments, if any. */ - -static boolean -common_op_match_null_string_p (p, end, reg_info) - unsigned char **p, *end; - register_info_type *reg_info; -{ - int mcnt; - boolean ret; - int reg_no; - unsigned char *p1 = *p; - - switch ((re_opcode_t) *p1++) - { - case no_op: - case begline: - case endline: - case begbuf: - case endbuf: - case wordbeg: - case wordend: - case wordbound: - case notwordbound: -#ifdef emacs - case before_dot: - case at_dot: - case after_dot: -#endif - break; - - case start_memory: - reg_no = *p1; - assert (reg_no > 0 && reg_no <= MAX_REGNUM); - ret = group_match_null_string_p (&p1, end, reg_info); - - /* Have to set this here in case we're checking a group which - contains a group and a back reference to it. */ - - if (REG_MATCH_NULL_STRING_P (reg_info[reg_no]) == MATCH_NULL_UNSET_VALUE) - REG_MATCH_NULL_STRING_P (reg_info[reg_no]) = ret; - - if (!ret) - return false; - break; - - /* If this is an optimized succeed_n for zero times, make the jump. */ - case jump: - EXTRACT_NUMBER_AND_INCR (mcnt, p1); - if (mcnt >= 0) - p1 += mcnt; - else - return false; - break; - - case succeed_n: - /* Get to the number of times to succeed. */ - p1 += 2; - EXTRACT_NUMBER_AND_INCR (mcnt, p1); - - if (mcnt == 0) - { - p1 -= 4; - EXTRACT_NUMBER_AND_INCR (mcnt, p1); - p1 += mcnt; - } - else - return false; - break; - - case duplicate: - if (!REG_MATCH_NULL_STRING_P (reg_info[*p1])) - return false; - break; - - case set_number_at: - p1 += 4; - - default: - /* All other opcodes mean we cannot match the empty string. */ - return false; - } - - *p = p1; - return true; -} /* common_op_match_null_string_p */ - - -/* Return zero if TRANSLATE[S1] and TRANSLATE[S2] are identical for LEN - bytes; nonzero otherwise. */ - -static int -bcmp_translate (s1, s2, len, translate) - const char *s1, *s2; - register int len; - RE_TRANSLATE_TYPE translate; -{ - register const unsigned char *p1 = (const unsigned char *) s1; - register const unsigned char *p2 = (const unsigned char *) s2; - while (len) - { - if (translate[*p1++] != translate[*p2++]) return 1; - len--; - } - return 0; -} - -/* Entry points for GNU code. */ - -/* re_compile_pattern is the GNU regular expression compiler: it - compiles PATTERN (of length SIZE) and puts the result in BUFP. - Returns 0 if the pattern was valid, otherwise an error string. - - Assumes the `allocated' (and perhaps `buffer') and `translate' fields - are set in BUFP on entry. - - We call regex_compile to do the actual compilation. */ - -const char * -re_compile_pattern (pattern, length, bufp) - const char *pattern; - size_t length; - struct re_pattern_buffer *bufp; -{ - reg_errcode_t ret; - - /* GNU code is written to assume at least RE_NREGS registers will be set - (and at least one extra will be -1). */ - bufp->regs_allocated = REGS_UNALLOCATED; - - /* And GNU code determines whether or not to get register information - by passing null for the REGS argument to re_match, etc., not by - setting no_sub. */ - bufp->no_sub = 0; - - /* Match anchors at newline. */ - bufp->newline_anchor = 1; - - ret = regex_compile (pattern, length, re_syntax_options, bufp); - - if (!ret) - return NULL; - return gettext (re_error_msgid + re_error_msgid_idx[(int) ret]); -} -#ifdef _LIBC -weak_alias (__re_compile_pattern, re_compile_pattern) -#endif - -/* Entry points compatible with 4.2 BSD regex library. We don't define - them unless specifically requested. */ - -#if defined _REGEX_RE_COMP || defined _LIBC - -/* BSD has one and only one pattern buffer. */ -static struct re_pattern_buffer re_comp_buf; - -char * -#ifdef _LIBC -/* Make these definitions weak in libc, so POSIX programs can redefine - these names if they don't use our functions, and still use - regcomp/regexec below without link errors. */ -weak_function -#endif -re_comp (s) - const char *s; -{ - reg_errcode_t ret; - - if (!s) - { - if (!re_comp_buf.buffer) - return gettext ("No previous regular expression"); - return 0; - } - - if (!re_comp_buf.buffer) - { - re_comp_buf.buffer = (unsigned char *) malloc (200); - if (re_comp_buf.buffer == NULL) - return (char *) gettext (re_error_msgid - + re_error_msgid_idx[(int) REG_ESPACE]); - re_comp_buf.allocated = 200; - - re_comp_buf.fastmap = (char *) malloc (1 << BYTEWIDTH); - if (re_comp_buf.fastmap == NULL) - return (char *) gettext (re_error_msgid - + re_error_msgid_idx[(int) REG_ESPACE]); - } - - /* Since `re_exec' always passes NULL for the `regs' argument, we - don't need to initialize the pattern buffer fields which affect it. */ - - /* Match anchors at newlines. */ - re_comp_buf.newline_anchor = 1; - - ret = regex_compile (s, strlen (s), re_syntax_options, &re_comp_buf); - - if (!ret) - return NULL; - - /* Yes, we're discarding `const' here if !HAVE_LIBINTL. */ - return (char *) gettext (re_error_msgid + re_error_msgid_idx[(int) ret]); -} - - -int -#ifdef _LIBC -weak_function -#endif -re_exec (s) - const char *s; -{ - const int len = strlen (s); - return - 0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0); -} - -#endif /* _REGEX_RE_COMP */ - -/* POSIX.2 functions. Don't define these for Emacs. */ - -#ifndef emacs - -/* regcomp takes a regular expression as a string and compiles it. - - PREG is a regex_t *. We do not expect any fields to be initialized, - since POSIX says we shouldn't. Thus, we set - - `buffer' to the compiled pattern; - `used' to the length of the compiled pattern; - `syntax' to RE_SYNTAX_POSIX_EXTENDED if the - REG_EXTENDED bit in CFLAGS is set; otherwise, to - RE_SYNTAX_POSIX_BASIC; - `newline_anchor' to REG_NEWLINE being set in CFLAGS; - `fastmap' to an allocated space for the fastmap; - `fastmap_accurate' to zero; - `re_nsub' to the number of subexpressions in PATTERN. - - PATTERN is the address of the pattern string. - - CFLAGS is a series of bits which affect compilation. - - If REG_EXTENDED is set, we use POSIX extended syntax; otherwise, we - use POSIX basic syntax. - - If REG_NEWLINE is set, then . and [^...] don't match newline. - Also, regexec will try a match beginning after every newline. - - If REG_ICASE is set, then we considers upper- and lowercase - versions of letters to be equivalent when matching. - - If REG_NOSUB is set, then when PREG is passed to regexec, that - routine will report only success or failure, and nothing about the - registers. - - It returns 0 if it succeeds, nonzero if it doesn't. (See regex.h for - the return codes and their meanings.) */ - -int -regcomp (preg, pattern, cflags) - regex_t *preg; - const char *pattern; - int cflags; -{ - reg_errcode_t ret; - reg_syntax_t syntax - = (cflags & REG_EXTENDED) ? - RE_SYNTAX_POSIX_EXTENDED : RE_SYNTAX_POSIX_BASIC; - - /* regex_compile will allocate the space for the compiled pattern. */ - preg->buffer = 0; - preg->allocated = 0; - preg->used = 0; - - /* Try to allocate space for the fastmap. */ - preg->fastmap = (char *) malloc (1 << BYTEWIDTH); - - if (cflags & REG_ICASE) - { - unsigned i; - - preg->translate - = (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE - * sizeof (*(RE_TRANSLATE_TYPE)0)); - if (preg->translate == NULL) - return (int) REG_ESPACE; - - /* Map uppercase characters to corresponding lowercase ones. */ - for (i = 0; i < CHAR_SET_SIZE; i++) - preg->translate[i] = ISUPPER (i) ? TOLOWER (i) : i; - } - else - preg->translate = NULL; - - /* If REG_NEWLINE is set, newlines are treated differently. */ - if (cflags & REG_NEWLINE) - { /* REG_NEWLINE implies neither . nor [^...] match newline. */ - syntax &= ~RE_DOT_NEWLINE; - syntax |= RE_HAT_LISTS_NOT_NEWLINE; - /* It also changes the matching behavior. */ - preg->newline_anchor = 1; - } - else - preg->newline_anchor = 0; - - preg->no_sub = !!(cflags & REG_NOSUB); - - /* POSIX says a null character in the pattern terminates it, so we - can use strlen here in compiling the pattern. */ - ret = regex_compile (pattern, strlen (pattern), syntax, preg); - - /* POSIX doesn't distinguish between an unmatched open-group and an - unmatched close-group: both are REG_EPAREN. */ - if (ret == REG_ERPAREN) ret = REG_EPAREN; - - if (ret == REG_NOERROR && preg->fastmap) - { - /* Compute the fastmap now, since regexec cannot modify the pattern - buffer. */ - if (re_compile_fastmap (preg) == -2) - { - /* Some error occured while computing the fastmap, just forget - about it. */ - free (preg->fastmap); - preg->fastmap = NULL; - } - } - - return (int) ret; -} -#ifdef _LIBC -weak_alias (__regcomp, regcomp) -#endif - - -/* regexec searches for a given pattern, specified by PREG, in the - string STRING. - - If NMATCH is zero or REG_NOSUB was set in the cflags argument to - `regcomp', we ignore PMATCH. Otherwise, we assume PMATCH has at - least NMATCH elements, and we set them to the offsets of the - corresponding matched substrings. - - EFLAGS specifies `execution flags' which affect matching: if - REG_NOTBOL is set, then ^ does not match at the beginning of the - string; if REG_NOTEOL is set, then $ does not match at the end. - - We return 0 if we find a match and REG_NOMATCH if not. */ - -int -regexec (preg, string, nmatch, pmatch, eflags) - const regex_t *preg; - const char *string; - size_t nmatch; - regmatch_t pmatch[]; - int eflags; -{ - int ret; - struct re_registers regs; - regex_t private_preg; - int len = strlen (string); - boolean want_reg_info = !preg->no_sub && nmatch > 0; - - private_preg = *preg; - - private_preg.not_bol = !!(eflags & REG_NOTBOL); - private_preg.not_eol = !!(eflags & REG_NOTEOL); - - /* The user has told us exactly how many registers to return - information about, via `nmatch'. We have to pass that on to the - matching routines. */ - private_preg.regs_allocated = REGS_FIXED; - - if (want_reg_info) - { - regs.num_regs = nmatch; - regs.start = TALLOC (nmatch * 2, regoff_t); - if (regs.start == NULL) - return (int) REG_NOMATCH; - regs.end = regs.start + nmatch; - } - - /* Perform the searching operation. */ - ret = re_search (&private_preg, string, len, - /* start: */ 0, /* range: */ len, - want_reg_info ? ®s : (struct re_registers *) 0); - - /* Copy the register information to the POSIX structure. */ - if (want_reg_info) - { - if (ret >= 0) - { - unsigned r; - - for (r = 0; r < nmatch; r++) - { - pmatch[r].rm_so = regs.start[r]; - pmatch[r].rm_eo = regs.end[r]; - } - } - - /* If we needed the temporary register info, free the space now. */ - free (regs.start); - } - - /* We want zero return to mean success, unlike `re_search'. */ - return ret >= 0 ? (int) REG_NOERROR : (int) REG_NOMATCH; -} -#ifdef _LIBC -weak_alias (__regexec, regexec) -#endif - - -/* Returns a message corresponding to an error code, ERRCODE, returned - from either regcomp or regexec. We don't use PREG here. */ - -size_t -regerror (err, preg, errbuf, errbuf_size) - int err; - const regex_t *preg; - char *errbuf; - size_t errbuf_size; -{ - const char *msg; - size_t msg_size; - - if (err < 0 - || err >= (int) (sizeof (re_error_msgid_idx) - / sizeof (re_error_msgid_idx[0]))) - /* Only error codes returned by the rest of the code should be passed - to this routine. If we are given anything else, or if other regex - code generates an invalid error code, then the program has a bug. - Dump core so we can fix it. */ - abort (); - - msg = gettext (re_error_msgid + re_error_msgid_idx[err]); - - msg_size = strlen (msg) + 1; /* Includes the null. */ - - if (errbuf_size != 0) - { - if (msg_size > errbuf_size) - { -#if defined HAVE_MEMPCPY || defined _LIBC - *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; -#else - memcpy (errbuf, msg, errbuf_size - 1); - errbuf[errbuf_size - 1] = 0; -#endif - } - else - memcpy (errbuf, msg, msg_size); - } - - return msg_size; -} -#ifdef _LIBC -weak_alias (__regerror, regerror) -#endif - - -/* Free dynamically allocated space used by PREG. */ - -void -regfree (preg) - regex_t *preg; -{ - if (preg->buffer != NULL) - free (preg->buffer); - preg->buffer = NULL; - - preg->allocated = 0; - preg->used = 0; - - if (preg->fastmap != NULL) - free (preg->fastmap); - preg->fastmap = NULL; - preg->fastmap_accurate = 0; - - if (preg->translate != NULL) - free (preg->translate); - preg->translate = NULL; -} -#ifdef _LIBC -weak_alias (__regfree, regfree) -#endif - -#endif /* not emacs */ diff --git a/lib/sockunion.c b/lib/sockunion.c index 96408965ab..f4b6ce12cc 100644 --- a/lib/sockunion.c +++ b/lib/sockunion.c @@ -25,99 +25,11 @@ #include "vty.h" #include "sockunion.h" #include "memory.h" -#include "str.h" #include "log.h" #include "jhash.h" DEFINE_MTYPE_STATIC(LIB, SOCKUNION, "Socket union") -#ifndef HAVE_INET_ATON -int -inet_aton (const char *cp, struct in_addr *inaddr) -{ - int dots = 0; - register u_long addr = 0; - register u_long val = 0, base = 10; - - do - { - register char c = *cp; - - switch (c) - { - case '0': case '1': case '2': case '3': case '4': case '5': - case '6': case '7': case '8': case '9': - val = (val * base) + (c - '0'); - break; - case '.': - if (++dots > 3) - return 0; - case '\0': - if (val > 255) - return 0; - addr = addr << 8 | val; - val = 0; - break; - default: - return 0; - } - } while (*cp++) ; - - if (dots < 3) - addr <<= 8 * (3 - dots); - if (inaddr) - inaddr->s_addr = htonl (addr); - return 1; -} -#endif /* ! HAVE_INET_ATON */ - - -#ifndef HAVE_INET_PTON -int -inet_pton (int family, const char *strptr, void *addrptr) -{ - if (family == AF_INET) - { - struct in_addr in_val; - - if (inet_aton (strptr, &in_val)) - { - memcpy (addrptr, &in_val, sizeof (struct in_addr)); - return 1; - } - return 0; - } - errno = EAFNOSUPPORT; - return -1; -} -#endif /* ! HAVE_INET_PTON */ - -#ifndef HAVE_INET_NTOP -const char * -inet_ntop (int family, const void *addrptr, char *strptr, size_t len) -{ - unsigned char *p = (unsigned char *) addrptr; - - if (family == AF_INET) - { - char temp[INET_ADDRSTRLEN]; - - snprintf(temp, sizeof(temp), "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); - - if (strlen(temp) >= len) - { - errno = ENOSPC; - return NULL; - } - strcpy(strptr, temp); - return strptr; - } - - errno = EAFNOSUPPORT; - return NULL; -} -#endif /* ! HAVE_INET_NTOP */ - const char * inet_sutop (const union sockunion *su, char *str) { @@ -312,9 +224,7 @@ sockunion_connect (int fd, const union sockunion *peersu, unsigned short port, #ifdef KAME if (IN6_IS_ADDR_LINKLOCAL(&su.sin6.sin6_addr) && ifindex) { -#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID su.sin6.sin6_scope_id = ifindex; -#endif /* HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID */ SET_IN6_LINKLOCAL_IFINDEX (su.sin6.sin6_addr, ifindex); } #endif /* KAME */ diff --git a/lib/sockunion.h b/lib/sockunion.h index 7dbd247dca..3af3d78059 100644 --- a/lib/sockunion.h +++ b/lib/sockunion.h @@ -109,17 +109,4 @@ extern union sockunion *sockunion_dup (const union sockunion *); extern void sockunion_free (union sockunion *); extern void sockunion_init (union sockunion *); -#ifndef HAVE_INET_NTOP -extern const char * inet_ntop (int family, const void *addrptr, - char *strptr, size_t len); -#endif /* HAVE_INET_NTOP */ - -#ifndef HAVE_INET_PTON -extern int inet_pton (int family, const char *strptr, void *addrptr); -#endif /* HAVE_INET_PTON */ - -#ifndef HAVE_INET_ATON -extern int inet_aton (const char *cp, struct in_addr *inaddr); -#endif - #endif /* _ZEBRA_SOCKUNION_H */ diff --git a/lib/str.c b/lib/str.c deleted file mode 100644 index cfdb6e024e..0000000000 --- a/lib/str.c +++ /dev/null @@ -1,143 +0,0 @@ -/* - * zebra string function - * - * XXX This version of snprintf does not check bounds! - */ - -/* - The implementations of strlcpy and strlcat are copied from rsync (GPL): - Copyright (C) Andrew Tridgell 1998 - Copyright (C) 2002 by Martin Pool - - Note that these are not terribly efficient, since they make more than one - pass over the argument strings. At some point, they should be optimized. - - The implementation of strndup is copied from glibc-2.3.5: - Copyright (C) 1996, 1997, 1998, 2001, 2002 Free Software Foundation, Inc. -*/ - -/* - * This file is part of Quagga. - * - * Quagga is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2, or (at your option) any - * later version. - * - * Quagga is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Quagga; see the file COPYING. If not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#include <zebra.h> - -#ifndef HAVE_SNPRINTF -/* - * snprint() is a real basic wrapper around the standard sprintf() - * without any bounds checking - */ -int -snprintf(char *str, size_t size, const char *format, ...) -{ - va_list args; - - va_start (args, format); - - return vsprintf (str, format, args); -} -#endif - -#ifndef HAVE_STRLCPY -/* - * Copy string src to buffer dst of size dsize. At most dsize-1 - * chars will be copied. Always NUL terminates (unless dsize == 0). - * Returns strlen(src); if retval >= dsize, truncation occurred. - */ -size_t -strlcpy(char *dst, const char *src, size_t dsize) -{ - const char *osrc = src; - size_t nleft = dsize; - - /* Copy as many bytes as will fit. */ - if (nleft != 0) { - while (--nleft != 0) { - if ((*dst++ = *src++) == '\0') - break; - } - } - - /* Not enough room in dst, add NUL and traverse rest of src. */ - if (nleft == 0) { - if (dsize != 0) - *dst = '\0'; /* NUL-terminate dst */ - while (*src++) - ; - } - - return(src - osrc - 1); /* count does not include NUL */ -} -#endif - -#ifndef HAVE_STRLCAT -/** - * Like strncat() but does not 0 fill the buffer and always null - * terminates. - * - * @param bufsize length of the buffer, which should be one more than - * the maximum resulting string length. - **/ -size_t -strlcat(char *d, const char *s, size_t bufsize) -{ - size_t len1 = strlen(d); - size_t len2 = strlen(s); - size_t ret = len1 + len2; - - if (len1 < bufsize - 1) { - if (len2 >= bufsize - len1) - len2 = bufsize - len1 - 1; - memcpy(d+len1, s, len2); - d[len1+len2] = 0; - } - return ret; -} -#endif - -#ifndef HAVE_STRNLEN -size_t -strnlen(const char *s, size_t maxlen) -{ - const char *p; - return (p = (const char *)memchr(s, '\0', maxlen)) ? (size_t)(p-s) : maxlen; -} -#endif - -#ifndef HAVE_STRNDUP -char * -strndup (const char *s, size_t maxlen) -{ - size_t len = strnlen (s, maxlen); - char *new = (char *) malloc (len + 1); - - if (new == NULL) - return NULL; - - new[len] = '\0'; - return (char *) memcpy (new, s, len); -} -#endif - -extern int -strmatch (const char *str1, const char *str2) -{ - if (!strcmp(str1, str2)) - return 1; - return 0; -} diff --git a/lib/str.h b/lib/str.h deleted file mode 100644 index dc8e7e5d67..0000000000 --- a/lib/str.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * $Id: str.h,v 1.4 2005/09/19 09:53:21 hasso Exp $ - */ - -#ifndef _ZEBRA_STR_H -#define _ZEBRA_STR_H - -#ifndef HAVE_SNPRINTF -extern int snprintf(char *, size_t, const char *, ...); -#endif - -#ifndef HAVE_VSNPRINTF -#define vsnprintf(buf, size, format, args) vsprintf(buf, format, args) -#endif - -#ifndef HAVE_STRLCPY -extern size_t strlcpy(char *, const char *, size_t); -#endif - -#ifndef HAVE_STRLCAT -extern size_t strlcat(char *, const char *, size_t); -#endif - -#ifndef HAVE_STRNLEN -extern size_t strnlen(const char *s, size_t maxlen); -#endif - -#ifndef HAVE_STRNDUP -extern char * strndup (const char *, size_t); -#endif - -extern int strmatch (const char *, const char *); - -#endif /* _ZEBRA_STR_H */ - diff --git a/lib/strlcat.c b/lib/strlcat.c new file mode 100644 index 0000000000..1d04b43d95 --- /dev/null +++ b/lib/strlcat.c @@ -0,0 +1,71 @@ +/* Append a null-terminated string to another string, with length checking. + Copyright (C) 2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +/* adapted for Quagga from glibc patch submission originally from + * Florian Weimer <fweimer@redhat.com>, 2016-05-18 */ + +#include <stdint.h> +#include <string.h> + +#include "config.h" + +#ifndef HAVE_STRLCAT +#undef strlcat + +size_t +strlcat (char *__restrict dest, const char *__restrict src, size_t size); + +size_t +strlcat (char *__restrict dest, const char *__restrict src, size_t size) +{ + size_t src_length = strlen (src); + + /* Our implementation strlcat supports dest == NULL if size == 0 + (for consistency with snprintf and strlcpy), but strnlen does + not, so we have to cover this case explicitly. */ + if (size == 0) + return src_length; + + size_t dest_length = strnlen (dest, size); + if (dest_length != size) + { + /* Copy at most the remaining number of characters in the + destination buffer. Leave for the NUL terminator. */ + size_t to_copy = size - dest_length - 1; + /* But not more than what is available in the source string. */ + if (to_copy > src_length) + to_copy = src_length; + + char *target = dest + dest_length; + memcpy (target, src, to_copy); + target[to_copy] = '\0'; + } + + /* If the sum wraps around, we have more than SIZE_MAX + 2 bytes in + the two input strings (including both null terminators). If each + byte in the address space can be assigned a unique size_t value + (which the static_assert checks), then by the pigeonhole + principle, the two input strings must overlap, which is + undefined. */ +#if __STDC_VERSION__ >= 201112L + _Static_assert (sizeof (uintptr_t) == sizeof (size_t), + "theoretical maximum object size covers address space"); +#endif + return dest_length + src_length; +} +#endif /* HAVE_STRLCAT */ diff --git a/lib/strlcpy.c b/lib/strlcpy.c new file mode 100644 index 0000000000..41bab97ea7 --- /dev/null +++ b/lib/strlcpy.c @@ -0,0 +1,56 @@ +/* Copy a null-terminated string to a fixed-size buffer, with length checking. + Copyright (C) 2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +/* adapted for Quagga from glibc patch submission originally from + * Florian Weimer <fweimer@redhat.com>, 2016-05-18 */ + +#include <string.h> + +#include "config.h" + +#ifndef HAVE_STRLCPY +#undef strlcpy + +size_t +strlcpy (char *__restrict dest, const char *__restrict src, size_t size); + +size_t +strlcpy (char *__restrict dest, const char *__restrict src, size_t size) +{ + size_t src_length = strlen (src); + + if (__builtin_expect (src_length >= size, 0)) + { + if (size > 0) + { + /* Copy the leading portion of the string. The last + character is subsequently overwritten with the NUL + terminator, but the destination size is usually a + multiple of a small power of two, so writing it twice + should be more efficient than copying an odd number of + bytes. */ + memcpy (dest, src, size); + dest[size - 1] = '\0'; + } + } + else + /* Copy the string and its terminating NUL character. */ + memcpy (dest, src, src_length + 1); + return src_length; +} +#endif /* HAVE_STRLCPY */ diff --git a/lib/thread.c b/lib/thread.c index 5dc296f2cc..ce93530ff1 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -221,16 +221,10 @@ static void vty_out_cpu_thread_history(struct vty* vty, struct cpu_thread_history *a) { -#ifdef HAVE_RUSAGE vty_out(vty, "%10ld.%03ld %9d %8ld %9ld %8ld %9ld", a->cpu.total/1000, a->cpu.total%1000, a->total_calls, a->cpu.total/a->total_calls, a->cpu.max, a->real.total/a->total_calls, a->real.max); -#else - vty_out(vty, "%10ld.%03ld %9d %8ld %9ld", - a->real.total/1000, a->real.total%1000, a->total_calls, - a->real.total/a->total_calls, a->real.max); -#endif vty_out(vty, " %c%c%c%c%c%c %s%s", a->types & (1 << THREAD_READ) ? 'R':' ', a->types & (1 << THREAD_WRITE) ? 'W':' ', @@ -257,11 +251,9 @@ cpu_record_hash_print(struct hash_backet *bucket, totals->real.total += a->real.total; if (totals->real.max < a->real.max) totals->real.max = a->real.max; -#ifdef HAVE_RUSAGE totals->cpu.total += a->cpu.total; if (totals->cpu.max < a->cpu.max) totals->cpu.max = a->cpu.max; -#endif } static void @@ -274,14 +266,10 @@ cpu_record_print(struct vty *vty, thread_type filter) tmp.funcname = "TOTAL"; tmp.types = filter; -#ifdef HAVE_RUSAGE vty_out(vty, "%21s %18s %18s%s", - "", "CPU (user+system):", "Real (wall-clock):", VTY_NEWLINE); -#endif - vty_out(vty, "Runtime(ms) Invoked Avg uSec Max uSecs"); -#ifdef HAVE_RUSAGE + "", "CPU (user+system):", "Real (wall-clock):", VTY_NEWLINE); + vty_out(vty, " Runtime(ms) Invoked Avg uSec Max uSecs"); vty_out(vty, " Avg uSec Max uSecs"); -#endif vty_out(vty, " Type Thread%s", VTY_NEWLINE); hash_iterate(cpu_record, (void(*)(struct hash_backet*,void*))cpu_record_hash_print, @@ -1375,13 +1363,9 @@ thread_fetch (struct thread_master *m, struct thread *fetch) unsigned long thread_consumed_time (RUSAGE_T *now, RUSAGE_T *start, unsigned long *cputime) { -#ifdef HAVE_RUSAGE /* This is 'user + sys' time. */ *cputime = timeval_elapsed (now->cpu.ru_utime, start->cpu.ru_utime) + timeval_elapsed (now->cpu.ru_stime, start->cpu.ru_stime); -#else - *cputime = 0; -#endif /* HAVE_RUSAGE */ return timeval_elapsed (now->real, start->real); } @@ -1413,9 +1397,7 @@ void thread_getrusage (RUSAGE_T *r) { quagga_get_relative (NULL); -#ifdef HAVE_RUSAGE getrusage(RUSAGE_SELF, &(r->cpu)); -#endif r->real = relative_time; #ifdef HAVE_CLOCK_MONOTONIC @@ -1468,11 +1450,9 @@ thread_call (struct thread *thread) thread->hist->real.total += realtime; if (thread->hist->real.max < realtime) thread->hist->real.max = realtime; -#ifdef HAVE_RUSAGE thread->hist->cpu.total += cputime; if (thread->hist->cpu.max < cputime) thread->hist->cpu.max = cputime; -#endif ++(thread->hist->total_calls); thread->hist->types |= (1 << thread->add_type); diff --git a/lib/thread.h b/lib/thread.h index c692142839..e41e96dec2 100644 --- a/lib/thread.h +++ b/lib/thread.h @@ -26,9 +26,7 @@ struct rusage_t { -#ifdef HAVE_RUSAGE struct rusage cpu; -#endif struct timeval real; }; #define RUSAGE_T struct rusage_t @@ -121,9 +119,7 @@ struct cpu_thread_history { unsigned long total, max; } real; -#ifdef HAVE_RUSAGE struct time_stats cpu; -#endif thread_type types; const char *funcname; }; diff --git a/lib/version.h.in b/lib/version.h.in index aef1d090b6..1f95f0c5f0 100644 --- a/lib/version.h.in +++ b/lib/version.h.in @@ -49,8 +49,4 @@ pid_t pid_output (const char *); -#ifndef HAVE_DAEMON -int daemon(int, int); -#endif - #endif /* _ZEBRA_VERSION_H */ @@ -29,7 +29,6 @@ #include "command.h" #include "sockunion.h" #include "memory.h" -#include "str.h" #include "log.h" #include "prefix.h" #include "filter.h" @@ -30,7 +30,8 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #define VTY_MAXHIST 20 #if defined(VTY_DEPRECATE_INDEX) && defined(__GNUC__) && \ - (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && \ + !defined(__ICC) #define INDEX_WARNING __attribute__((deprecated)) #else #define INDEX_WARNING diff --git a/lib/zebra.h b/lib/zebra.h index 08c50c68bc..5bb3590abd 100644 --- a/lib/zebra.h +++ b/lib/zebra.h @@ -32,10 +32,6 @@ typedef unsigned short u_int16_t; typedef unsigned char u_int8_t; #endif /* SUNOS_5 */ -#ifndef HAVE_SOCKLEN_T -typedef int socklen_t; -#endif /* HAVE_SOCKLEN_T */ - #include <unistd.h> #include <stdio.h> #include <stdlib.h> @@ -50,9 +46,7 @@ typedef int socklen_t; #ifdef HAVE_STROPTS_H #include <stropts.h> #endif /* HAVE_STROPTS_H */ -#ifdef HAVE_SYS_SELECT_H #include <sys/select.h> -#endif /* HAVE_SYS_SELECT_H */ #include <sys/stat.h> #include <sys/types.h> #include <sys/param.h> @@ -70,30 +64,14 @@ typedef int socklen_t; #include <sys/ksym.h> #endif /* HAVE_SYS_KSYM_H */ #include <syslog.h> -#ifdef TIME_WITH_SYS_TIME -# include <sys/time.h> -# include <time.h> -#else -# ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -# else -# include <time.h> -# endif -#endif /* TIME_WITH_SYS_TIME */ +#include <sys/time.h> +#include <time.h> #include <sys/uio.h> #include <sys/utsname.h> -#ifdef HAVE_RUSAGE #include <sys/resource.h> -#endif /* HAVE_RUSAGE */ -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif /* HAVE_LIMITS_H */ -#ifdef HAVE_INTTYPES_H #include <inttypes.h> -#endif /* HAVE_INTTYPES_H */ -#ifdef HAVE_STDBOOL_H #include <stdbool.h> -#endif /* machine dependent includes */ #ifdef SUNOS_5 @@ -148,9 +126,7 @@ typedef int socklen_t; #define __APPLE_USE_RFC_3542 #endif -#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> -#endif /* HAVE_NETINET_IN_H */ #include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/tcp.h> @@ -169,9 +145,7 @@ typedef int socklen_t; #include <net/if_var.h> #endif /* HAVE_NET_IF_VAR_H */ -#ifdef HAVE_NET_ROUTE_H #include <net/route.h> -#endif /* HAVE_NET_ROUTE_H */ #ifdef HAVE_NETLINK #include <linux/netlink.h> @@ -181,10 +155,7 @@ typedef int socklen_t; #define RT_TABLE_MAIN 0 #endif /* HAVE_NETLINK */ -#ifdef HAVE_NETDB_H #include <netdb.h> -#endif /* HAVE_NETDB_H */ - #include <arpa/inet.h> #ifdef HAVE_INET_ND_H @@ -212,9 +183,7 @@ typedef int socklen_t; #include <netinet6/ip6.h> #endif /* HAVE_NETINET6_IP6_H */ -#ifdef HAVE_NETINET_ICMP6_H #include <netinet/icmp6.h> -#endif /* HAVE_NETINET_ICMP6_H */ #ifdef HAVE_NETINET6_ND6_H #include <netinet6/nd6.h> @@ -252,8 +221,13 @@ typedef int socklen_t; #endif /* !__GNUC__ || VTYSH_EXTRACT_PL */ #include "zassert.h" -#include "str.h" +#ifndef HAVE_STRLCAT +size_t strlcat (char *__restrict dest, const char *__restrict src, size_t size); +#endif +#ifndef HAVE_STRLCPY +size_t strlcpy (char *__restrict dest, const char *__restrict src, size_t size); +#endif #ifdef HAVE_BROKEN_CMSG_FIRSTHDR /* This bug is present in Solaris 8 and pre-patch Solaris 9 <sys/socket.h>; @@ -461,6 +435,8 @@ extern int proto_redistnum(int afi, const char *s); extern const char *zserv_command_string (unsigned int command); +#define strmatch(a,b) (!strcmp((a), (b))) + /* Error codes of zebra. */ #define ZEBRA_ERR_NOERROR 0 #define ZEBRA_ERR_RTEXIST -1 diff --git a/ospf6d/ospf6_network.c b/ospf6d/ospf6_network.c index 2227d03477..0d730c5967 100644 --- a/ospf6d/ospf6_network.c +++ b/ospf6d/ospf6_network.c @@ -226,9 +226,7 @@ ospf6_sendmsg (struct in6_addr *src, struct in6_addr *dst, dst_sin6.sin6_len = sizeof (struct sockaddr_in6); #endif /*SIN6_LEN*/ memcpy (&dst_sin6.sin6_addr, dst, sizeof (struct in6_addr)); -#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID dst_sin6.sin6_scope_id = *ifindex; -#endif /* send control msg */ scmsgp->cmsg_level = IPPROTO_IPV6; diff --git a/pimd/pim_tlv.h b/pimd/pim_tlv.h index 59d49954e7..8556e931ab 100644 --- a/pimd/pim_tlv.h +++ b/pimd/pim_tlv.h @@ -29,10 +29,6 @@ #include "if.h" #include "linklist.h" -#ifdef HAVE_INTTYPES_H -#include <inttypes.h> -#endif /* HAVE_INTTYPES_H */ - #define PIM_MSG_OPTION_TYPE_HOLDTIME (1) #define PIM_MSG_OPTION_TYPE_LAN_PRUNE_DELAY (2) #define PIM_MSG_OPTION_TYPE_DR_PRIORITY (19) diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in index 4a34ec0194..fc5a5147f1 100755 --- a/vtysh/extract.pl.in +++ b/vtysh/extract.pl.in @@ -87,7 +87,7 @@ my $cli_stomp = 0; foreach (@ARGV) { $file = $_; - open (FH, "@CPP@ -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_builddir@/lib -I@top_srcdir@/isisd/topology -I@top_srcdir@/bgpd -I@top_srcdir@/@LIBRFP@ -I@top_srcdir@/bgpd/rfapi @CPPFLAGS@ $file |"); + open (FH, "@CPP@ -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_builddir@/lib -I@top_srcdir@/bgpd -I@top_srcdir@/@LIBRFP@ -I@top_srcdir@/bgpd/rfapi @CPPFLAGS@ $file |"); local $/; undef $/; $line = <FH>; close (FH); diff --git a/zebra/if_ioctl.c b/zebra/if_ioctl.c index 5b7b5863e5..cc348fc237 100644 --- a/zebra/if_ioctl.c +++ b/zebra/if_ioctl.c @@ -36,6 +36,8 @@ #include "zebra/interface.h" #include "zebra/rib.h" +#include <ifaddrs.h> + /* Interface looking up using infamous SIOCGIFCONF. */ static int interface_list_ioctl (void) @@ -138,44 +140,7 @@ interface_list_ioctl (void) static int if_get_index (struct interface *ifp) { -#if defined(HAVE_IF_NAMETOINDEX) - /* Modern systems should have if_nametoindex(3). */ ifp->ifindex = if_nametoindex(ifp->name); -#elif defined(SIOCGIFINDEX) && !defined(HAVE_BROKEN_ALIASES) - /* Fall-back for older linuxes. */ - int ret; - struct ifreq ifreq; - static int if_fake_index; - - ifreq_set_name (&ifreq, ifp); - - ret = if_ioctl (SIOCGIFINDEX, (caddr_t) &ifreq); - if (ret < 0) - { - /* Linux 2.0.X does not have interface index. */ - ifp->ifindex = if_fake_index++; - return ifp->ifindex; - } - - /* OK we got interface index. */ -#ifdef ifr_ifindex - ifp->ifindex = ifreq.ifr_ifindex; -#else - ifp->ifindex = ifreq.ifr_index; -#endif - -#else -/* Linux 2.2.X does not provide individual interface index - for aliases and we know it. For others issue a warning. */ -#if !defined(HAVE_BROKEN_ALIASES) -#warning "Using if_fake_index. You may want to add appropriate" -#warning "mapping from ifname to ifindex for your system..." -#endif - /* This branch probably won't provide usable results, but anyway... */ - static int if_fake_index = 1; - ifp->ifindex = if_fake_index++; -#endif - return ifp->ifindex; } @@ -211,9 +176,6 @@ if_get_hwaddr (struct interface *ifp) } #endif /* SIOCGIFHWADDR */ -#ifdef HAVE_GETIFADDRS -#include <ifaddrs.h> - static int if_getaddrs (void) { @@ -334,93 +296,6 @@ if_getaddrs (void) return 0; } -#else /* HAVE_GETIFADDRS */ -/* Interface address lookup by ioctl. This function only looks up - IPv4 address. */ -int -if_get_addr (struct interface *ifp) -{ - int ret; - struct ifreq ifreq; - struct sockaddr_in addr; - struct sockaddr_in mask; - struct sockaddr_in dest; - struct in_addr *dest_pnt; - u_char prefixlen; - int flags = 0; - - /* Interface's name and address family. */ - strncpy (ifreq.ifr_name, ifp->name, IFNAMSIZ); - ifreq.ifr_addr.sa_family = AF_INET; - - /* Interface's address. */ - ret = if_ioctl (SIOCGIFADDR, (caddr_t) &ifreq); - if (ret < 0) - { - if (errno != EADDRNOTAVAIL) - { - zlog_warn ("SIOCGIFADDR fail: %s", safe_strerror (errno)); - return ret; - } - return 0; - } - memcpy (&addr, &ifreq.ifr_addr, sizeof (struct sockaddr_in)); - - /* Interface's network mask. */ - ret = if_ioctl (SIOCGIFNETMASK, (caddr_t) &ifreq); - if (ret < 0) - { - if (errno != EADDRNOTAVAIL) - { - zlog_warn ("SIOCGIFNETMASK fail: %s", safe_strerror (errno)); - return ret; - } - return 0; - } -#ifdef ifr_netmask - memcpy (&mask, &ifreq.ifr_netmask, sizeof (struct sockaddr_in)); -#else - memcpy (&mask, &ifreq.ifr_addr, sizeof (struct sockaddr_in)); -#endif /* ifr_netmask */ - prefixlen = ip_masklen (mask.sin_addr); - - /* Point to point or borad cast address pointer init. */ - dest_pnt = NULL; - - ret = if_ioctl (SIOCGIFDSTADDR, (caddr_t) &ifreq); - if (ret < 0) - { - if (errno != EADDRNOTAVAIL) - zlog_warn ("SIOCGIFDSTADDR fail: %s", safe_strerror (errno)); - } - else if (!IPV4_ADDR_SAME(&addr.sin_addr, &ifreq.ifr_dstaddr.sin_addr)) - { - memcpy (&dest, &ifreq.ifr_dstaddr, sizeof (struct sockaddr_in)); - dest_pnt = &dest.sin_addr; - flags = ZEBRA_IFA_PEER; - } - if (!dest_pnt) - { - ret = if_ioctl (SIOCGIFBRDADDR, (caddr_t) &ifreq); - if (ret < 0) - { - if (errno != EADDRNOTAVAIL) - zlog_warn ("SIOCGIFBRDADDR fail: %s", safe_strerror (errno)); - } - else if (!IPV4_ADDR_SAME(&addr.sin_addr, &ifreq.ifr_broadaddr.sin_addr)) - { - memcpy (&dest, &ifreq.ifr_broadaddr, sizeof (struct sockaddr_in)); - dest_pnt = &dest.sin_addr; - } - } - - - /* Set address to the interface. */ - connected_add_ipv4 (ifp, flags, &addr.sin_addr, prefixlen, dest_pnt, NULL); - - return 0; -} -#endif /* HAVE_GETIFADDRS */ /* Fetch interface information via ioctl(). */ static void @@ -436,9 +311,6 @@ interface_info_ioctl () if_get_hwaddr (ifp); #endif /* SIOCGIFHWADDR */ if_get_flags (ifp); -#ifndef HAVE_GETIFADDRS - if_get_addr (ifp); -#endif /* ! HAVE_GETIFADDRS */ if_get_mtu (ifp); if_get_metric (ifp); } @@ -462,9 +334,7 @@ interface_list (struct zebra_ns *zns) interface's information. */ interface_info_ioctl (); -#ifdef HAVE_GETIFADDRS if_getaddrs (); -#endif /* HAVE_GETIFADDRS */ #if defined(HAVE_IPV6) && defined(HAVE_PROC_NET_IF_INET6) /* Linux provides interface's IPv6 address via diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index 6cb9f78598..bcd92e15fe 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -33,7 +33,6 @@ #include "zebra_memory.h" #include "ioctl.h" #include "log.h" -#include "str.h" #include "table.h" #include "rib.h" #include "privs.h" diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c index 2bde3f4b08..b2c99d9813 100644 --- a/zebra/rt_socket.c +++ b/zebra/rt_socket.c @@ -29,7 +29,6 @@ #include "prefix.h" #include "sockunion.h" #include "log.h" -#include "str.h" #include "privs.h" #include "zebra/debug.h" diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c index 15e5c330e4..3b19a5da06 100644 --- a/zebra/zebra_mpls.c +++ b/zebra/zebra_mpls.c @@ -24,7 +24,6 @@ #include "prefix.h" #include "table.h" #include "memory.h" -#include "str.h" #include "command.h" #include "if.h" #include "log.h" diff --git a/zebra/zebra_mpls_netlink.c b/zebra/zebra_mpls_netlink.c index 1f894b33c6..045bee2b91 100644 --- a/zebra/zebra_mpls_netlink.c +++ b/zebra/zebra_mpls_netlink.c @@ -1,3 +1,24 @@ +/* MPLS forwarding table updates using netlink over GNU/Linux system. + * Copyright (C) 2016 Cumulus Networks, Inc. + * + * This file is part of Quagga. + * + * Quagga is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2, or (at your option) any + * later version. + * + * Quagga is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Quagga; see the file COPYING. If not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + #include <zebra.h> #include "zebra/rt.h" #include "zebra/rt_netlink.h" diff --git a/zebra/zebra_mpls_null.c b/zebra/zebra_mpls_null.c index 7727c84a88..23f5e72956 100644 --- a/zebra/zebra_mpls_null.c +++ b/zebra/zebra_mpls_null.c @@ -1,3 +1,24 @@ +/* + * Copyright (C) 2016 by Open Source Routing. + * + * This file is part of GNU Zebra. + * + * GNU Zebra is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2, or (at your option) any + * later version. + * + * GNU Zebra is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Zebra; see the file COPYING. If not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + #include <zebra.h> #include "zebra/rt.h" #include "zebra/zebra_mpls.h" diff --git a/zebra/zebra_mpls_openbsd.c b/zebra/zebra_mpls_openbsd.c index bae1de66bf..1127f568c0 100644 --- a/zebra/zebra_mpls_openbsd.c +++ b/zebra/zebra_mpls_openbsd.c @@ -1,3 +1,24 @@ +/* + * Copyright (C) 2016 by Open Source Routing. + * + * This file is part of GNU Zebra. + * + * GNU Zebra is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2, or (at your option) any + * later version. + * + * GNU Zebra is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Zebra; see the file COPYING. If not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + #include <zebra.h> #include <netmpls/mpls.h> #include "zebra/rt.h" diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 394469950d..8b36eb8060 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -26,7 +26,6 @@ #include "table.h" #include "memory.h" #include "zebra_memory.h" -#include "str.h" #include "command.h" #include "log.h" #include "sockunion.h" diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c index 8df9277cb3..062f9d3831 100644 --- a/zebra/zebra_rnh.c +++ b/zebra/zebra_rnh.c @@ -24,7 +24,6 @@ #include "prefix.h" #include "table.h" #include "memory.h" -#include "str.h" #include "command.h" #include "if.h" #include "log.h" diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c index 3186ebf693..19364b5b91 100644 --- a/zebra/zebra_snmp.c +++ b/zebra/zebra_snmp.c @@ -343,7 +343,7 @@ get_fwtable_route_node(struct variable *v, oid objid[], size_t *objid_len, */ if (*objid_len > (unsigned) v->namelen) - oid2in_addr (objid + v->namelen, MIN(4, *objid_len - v->namelen), &dest); + oid2in_addr (objid + v->namelen, MIN(4U, *objid_len - v->namelen), &dest); if (*objid_len > (unsigned) v->namelen + 4) proto = objid[v->namelen + 4]; @@ -352,7 +352,7 @@ get_fwtable_route_node(struct variable *v, oid objid[], size_t *objid_len, policy = objid[v->namelen + 5]; if (*objid_len > (unsigned) v->namelen + 6) - oid2in_addr (objid + v->namelen + 6, MIN(4, *objid_len - v->namelen - 6), + oid2in_addr (objid + v->namelen + 6, MIN(4U, *objid_len - v->namelen - 6), &nexthop); /* Apply GETNEXT on not exact search */ |