proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 10:37:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2005-05-23 Paul Jakma <paul@dishone.st>

Browse Source 
* routemap.c: (rmap_onmatch_goto) fix crash if 'continue' command
	  is used, which does not supply an argv[0].
	  this is a backport candidate /iff/ the trailing ; is removed
	  from VTY_GET_INTEGER_RANGE
	* vty.h: fix the VTY_GET macros, do {..} while(0) so they have
	  correct function like syntax in usage.
This commit is contained in:
paul 2005-05-23 12:43:34 +00:00
parent d5c9253966
commit d4f0960cb2
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ChangeLog
View File

@ -3,6 +3,12 @@
* memtypes.awk: use character classes, which work correctly in * memtypes.awk: use character classes, which work correctly in
all LC_COLLATE environments, unlike A-Z, which doesnt work in all LC_COLLATE environments, unlike A-Z, which doesnt work in
eg estonian collate order. Reported by Hasso. eg estonian collate order. Reported by Hasso.
* routemap.c: (rmap_onmatch_goto) fix crash if 'continue' command
is used, which does not supply an argv[0].
this is a backport candidate /iff/ the trailing ; is removed
from VTY_GET_INTEGER_RANGE
* vty.h: fix the VTY_GET macros, do {..} while(0) so they have
correct function like syntax in usage.
2005-05-19 Paul Jakma <paul@dishone.st> 2005-05-19 Paul Jakma <paul@dishone.st>

12
lib/routemap.c
View File

@ -26,6 +26,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
#include "prefix.h" #include "prefix.h"
#include "routemap.h" #include "routemap.h"
#include "command.h" #include "command.h"
#include "vty.h"
#include "log.h" #include "log.h"
/* Vector for route match rules. */ /* Vector for route match rules. */
@ -1063,15 +1064,16 @@ DEFUN (rmap_onmatch_goto,
"Goto Clause number\n" "Goto Clause number\n"
"Number\n") "Number\n")
{ {
struct route_map_index *index; struct route_map_index *index = vty->index;
int d = 0; int d = 0;
if (argv[0])
d = atoi(argv[0]);
index = vty->index;
if (index) if (index)
{ {
if (argc == 1 && argv[0])
VTY_GET_INTEGER_RANGE("route-map index", d, argv[0], 1, 65536);
else
d = index->pref + 1;
if (d <= index->pref) if (d <= index->pref)
{ {
/* Can't allow you to do that, Dave */ /* Can't allow you to do that, Dave */

20
lib/vty.h
View File

@ -149,7 +149,7 @@ struct vty
/* Utility macros to convert VTY argument to unsigned long or integer. */ /* Utility macros to convert VTY argument to unsigned long or integer. */
#define VTY_GET_LONG(NAME,V,STR) \ #define VTY_GET_LONG(NAME,V,STR) \
{ \ do { \
char *endptr = NULL; \ char *endptr = NULL; \
(V) = strtoul ((STR), &endptr, 10); \ (V) = strtoul ((STR), &endptr, 10); \
if (*endptr != '\0' || (V) == ULONG_MAX) \ if (*endptr != '\0' || (V) == ULONG_MAX) \
@ -157,25 +157,25 @@ struct vty
vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE); \ vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE); \
return CMD_WARNING; \ return CMD_WARNING; \
} \ } \
} } while (0)
#define VTY_GET_INTEGER_RANGE(NAME,V,STR,MIN,MAX) \ #define VTY_GET_INTEGER_RANGE(NAME,V,STR,MIN,MAX) \
{ \ do { \
unsigned long tmpl; \ unsigned long tmpl; \
VTY_GET_LONG(NAME, tmpl, STR) \ VTY_GET_LONG(NAME, tmpl, STR); \
if ( tmpl < (MIN) || tmpl > (MAX)) \ if ( (tmpl < (MIN)) || (tmpl > (MAX))) \
{ \ { \
vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE); \ vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE); \
return CMD_WARNING; \ return CMD_WARNING; \
} \ } \
(V) = tmpl; \ (V) = tmpl; \
} } while (0)
#define VTY_GET_INTEGER(NAME,V,STR) \ #define VTY_GET_INTEGER(NAME,V,STR) \
VTY_GET_INTEGER_RANGE(NAME,V,STR,0U,UINT32_MAX) VTY_GET_INTEGER_RANGE(NAME,V,STR,0U,UINT32_MAX)
#define VTY_GET_IPV4_ADDRESS(NAME,V,STR) \ #define VTY_GET_IPV4_ADDRESS(NAME,V,STR) \
{ \ do { \
int retv; \ int retv; \
retv = inet_aton ((STR), &(V)); \ retv = inet_aton ((STR), &(V)); \
if (!retv) \ if (!retv) \
@ -183,10 +183,10 @@ struct vty
vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE); \ vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE); \
return CMD_WARNING; \ return CMD_WARNING; \
} \ } \
} } while (0)
#define VTY_GET_IPV4_PREFIX(NAME,V,STR) \ #define VTY_GET_IPV4_PREFIX(NAME,V,STR) \
{ \ do { \
int retv; \ int retv; \
retv = str2prefix_ipv4 ((STR), &(V)); \ retv = str2prefix_ipv4 ((STR), &(V)); \
if (retv <= 0) \ if (retv <= 0) \
@ -194,7 +194,7 @@ struct vty
vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE); \ vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE); \
return CMD_WARNING; \ return CMD_WARNING; \
} \ } \
} } while (0)
/* Exported variables */ /* Exported variables */
extern char integrate_default[]; extern char integrate_default[];