proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 07:21:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: fix area virtual-link command

Browse Source 
Adjust to review comments

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
This commit is contained in:
Chirag Shah 2017-09-30 19:14:18 -07:00
parent 55d1da2490
commit cbb9b53d32
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ospfd/ospf_vty.c
View File

@ -983,7 +983,8 @@ DEFUN (ospf_area_vlink,
"Key ID\n" "Key ID\n"
"Use MD5 algorithm\n" "Use MD5 algorithm\n"
"The OSPF password (key)\n" "The OSPF password (key)\n"
"Authentication password (key)") "Authentication password (key)\n"
"The OSPF password (key)")
{ {
VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf); VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
int idx_ipv4_number = 1; int idx_ipv4_number = 1;
@ -1032,23 +1033,19 @@ DEFUN (ospf_area_vlink,
} }
if (argv_find(argv, argc, "message-digest-key", &idx)) { if (argv_find(argv, argc, "message-digest-key", &idx)) {
idx = idx + 1; /* Fetch key_id */
vl_config.md5_key = NULL; vl_config.md5_key = NULL;
vl_config.crypto_key_id = strtol(argv[idx]->arg, NULL, 10); vl_config.crypto_key_id = strtol(argv[idx + 1]->arg, NULL, 10);
if (vl_config.crypto_key_id < 0) if (vl_config.crypto_key_id < 0)
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
idx = idx + 1; /* Fetch md5_key */
memset(md5_key, 0, OSPF_AUTH_MD5_SIZE + 1); memset(md5_key, 0, OSPF_AUTH_MD5_SIZE + 1);
strncpy(md5_key, argv[idx]->arg, OSPF_AUTH_MD5_SIZE); strncpy(md5_key, argv[idx + 3]->arg, OSPF_AUTH_MD5_SIZE);
vl_config.md5_key = md5_key; vl_config.md5_key = md5_key;
} }
if (argv_find(argv, argc, "authentication-key", &idx)) { if (argv_find(argv, argc, "authentication-key", &idx)) {
idx = idx + 1;
memset(auth_key, 0, OSPF_AUTH_SIMPLE_SIZE + 1); memset(auth_key, 0, OSPF_AUTH_SIMPLE_SIZE + 1);
strncpy(auth_key, argv[idx]->text, OSPF_AUTH_SIMPLE_SIZE); strncpy(auth_key, argv[idx + 1]->arg, OSPF_AUTH_SIMPLE_SIZE);
vl_config.auth_key = auth_key; vl_config.auth_key = auth_key;
} }
@ -1069,7 +1066,8 @@ DEFUN (no_ospf_area_vlink,
"Key ID\n" \ "Key ID\n" \
"Use MD5 algorithm\n" \ "Use MD5 algorithm\n" \
"The OSPF password (key)\n" \ "The OSPF password (key)\n" \
"Authentication password (key)") "Authentication password (key)\n" \
"The OSPF password (key)")
{ {
VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf); VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
int idx_ipv4_number = 2; int idx_ipv4_number = 2;
@ -1123,15 +1121,14 @@ DEFUN (no_ospf_area_vlink,
} }
if (argv_find(argv, argc, "message-digest-key", &idx)) { if (argv_find(argv, argc, "message-digest-key", &idx)) {
idx = idx + 1; /* Fetch key_id */
vl_config.md5_key = NULL; vl_config.md5_key = NULL;
vl_config.crypto_key_id = strtol(argv[idx]->arg, NULL, 10); vl_config.crypto_key_id = strtol(argv[idx + 1]->arg, NULL, 10);
if (vl_config.crypto_key_id < 0) if (vl_config.crypto_key_id < 0)
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
if (argv_find(argv, argc, "authentication-key", &idx)) { if (argv_find(argv, argc, "authentication-key", &idx)) {
idx = idx + 1; /* Reset authentication-key to 0 */
memset(auth_key, 0, OSPF_AUTH_SIMPLE_SIZE + 1); memset(auth_key, 0, OSPF_AUTH_SIMPLE_SIZE + 1);
vl_config.auth_key = auth_key; vl_config.auth_key = auth_key;
} }