proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 03:40:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2004-10-31 Paul Jakma <paul@dishone.st>

Browse Source 
* keychain.c: Convert some more strtoul users to VTY_GET_INTEGER.
This commit is contained in:
paul 2004-10-31 16:15:33 +00:00
parent 37ccfa3def
commit 66cbbcebc8
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ChangeLog
View File

@ -3,6 +3,7 @@
* vty.c: As per Andrew's suggestions.. * vty.c: As per Andrew's suggestions..
(vty_serv_un) remove flags. (vty_serv_un) remove flags.
(vtysh_accept) close socket if we cant set NONBLOCK. Add flags. (vtysh_accept) close socket if we cant set NONBLOCK. Add flags.
* keychain.c: Convert some more strtoul users to VTY_GET_INTEGER.
2004-10-29 Paul Jakma <paul@dishone.st> 2004-10-29 Paul Jakma <paul@dishone.st>

29
lib/keychain.c
View File

@ -278,16 +278,10 @@ DEFUN (key,
struct keychain *keychain; struct keychain *keychain;
struct key *key; struct key *key;
u_int32_t index; u_int32_t index;
char *endptr = NULL;
keychain = vty->index; keychain = vty->index;
index = strtoul (argv[0], &endptr, 10); VTY_GET_INTEGER ("key identifier", index, argv[0]);
if (index == ULONG_MAX || *endptr != '\0')
{
vty_out (vty, "Key identifier number error%s", VTY_NEWLINE);
return CMD_WARNING;
}
key = key_get (keychain, index); key = key_get (keychain, index);
vty->index_sub = key; vty->index_sub = key;
vty->node = KEYCHAIN_KEY_NODE; vty->node = KEYCHAIN_KEY_NODE;
@ -305,17 +299,10 @@ DEFUN (no_key,
struct keychain *keychain; struct keychain *keychain;
struct key *key; struct key *key;
u_int32_t index; u_int32_t index;
char *endptr = NULL;
keychain = vty->index; keychain = vty->index;
index = strtoul (argv[0], &endptr, 10); VTY_GET_INTEGER ("key identifier", index, argv[0]);
if (index == ULONG_MAX || *endptr != '\0')
{
vty_out (vty, "Key identifier number error%s", VTY_NEWLINE);
return CMD_WARNING;
}
key = key_lookup (keychain, index); key = key_lookup (keychain, index);
if (! key) if (! key)
{ {
@ -462,7 +449,7 @@ key_str2time (const char *time_str, const char *day_str, const char *month_str,
tm.tm_year = year - 1900; tm.tm_year = year - 1900;
time = mktime (&tm); time = mktime (&tm);
return time; return time;
} }
@ -475,7 +462,7 @@ key_lifetime_set (struct vty *vty, struct key_range *krange,
{ {
time_t time_start; time_t time_start;
time_t time_end; time_t time_end;
time_start = key_str2time (stime_str, sday_str, smonth_str, syear_str); time_start = key_str2time (stime_str, sday_str, smonth_str, syear_str);
if (time_start < 0) if (time_start < 0)
{ {
@ -510,7 +497,6 @@ key_lifetime_duration_set (struct vty *vty, struct key_range *krange,
{ {
time_t time_start; time_t time_start;
u_int32_t duration; u_int32_t duration;
char *endptr = NULL;
time_start = key_str2time (stime_str, sday_str, smonth_str, syear_str); time_start = key_str2time (stime_str, sday_str, smonth_str, syear_str);
if (time_start < 0) if (time_start < 0)
@ -520,12 +506,7 @@ key_lifetime_duration_set (struct vty *vty, struct key_range *krange,
} }
krange->start = time_start; krange->start = time_start;
duration = strtoul (duration_str, &endptr, 10); VTY_GET_INTEGER ("duration", duration, duration_str);
if (duration == ULONG_MAX || *endptr != '\0')
{
vty_out (vty, "Malformed duration%s", VTY_NEWLINE);
return CMD_WARNING;
}
krange->duration = 1; krange->duration = 1;
krange->end = time_start + duration; krange->end = time_start + duration;