matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

ospfd,ospf6d: make clear the comparison of routemap name

Browse source 
Comparison of the two pointer is confusing, they have no relevance
except the time both of them are empty.

Additionly modify one variable name and correct some comment words, they
are same in both ospfd and ospf6d.

Signed-off-by: anlan_cs <anlan_cs@tom.com>
This commit is contained in:
anlan_cs 2022-01-10 20:45:10 -05:00
parent c274b697ee
commit ff5c476dc2
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ospf6d/ospf6_asbr.c
View file

@ -1936,13 +1936,13 @@ DEFPY (ospf6_default_route_originate,
if (mtype_str == NULL)
mtype = -1;
/* To check ,if user is providing same route map */
if ((rtmap == ROUTEMAP_NAME(red))
|| (rtmap && ROUTEMAP_NAME(red)
&& (strcmp(rtmap, ROUTEMAP_NAME(red)) == 0)))
/* To check if user is providing same route map */
if ((!rtmap && !ROUTEMAP_NAME(red)) ||
(rtmap && ROUTEMAP_NAME(red) &&
(strcmp(rtmap, ROUTEMAP_NAME(red)) == 0)))
sameRtmap = true;
/* Don't allow if the same lsa is aleardy originated. */
/* Don't allow if the same lsa is already originated. */
if ((sameRtmap) && (red->dmetric.type == mtype)
&& (red->dmetric.value == mval)
&& (cur_originate == default_originate))

14
ospfd/ospf_vty.c
View file

@ -9275,7 +9275,7 @@ DEFUN (ospf_default_information_originate,
struct ospf_redist *red;
int idx = 0;
int cur_originate = ospf->default_originate;
int sameRtmap = 0;
bool sameRtmap = false;
char *rtmap = NULL;
red = ospf_redist_add(ospf, DEFAULT_ROUTE, 0);
@ -9300,13 +9300,13 @@ DEFUN (ospf_default_information_originate,
if (argv_find(argv, argc, "WORD", &idx))
rtmap = argv[idx]->arg;
/* To check ,if user is providing same route map */
if ((rtmap == ROUTEMAP_NAME(red)) ||
(rtmap && ROUTEMAP_NAME(red)
&& (strcmp(rtmap, ROUTEMAP_NAME(red)) == 0)))
sameRtmap = 1;
/* To check if user is providing same route map */
if ((!rtmap && !ROUTEMAP_NAME(red)) ||
(rtmap && ROUTEMAP_NAME(red) &&
(strcmp(rtmap, ROUTEMAP_NAME(red)) == 0)))
sameRtmap = true;
/* Don't allow if the same lsa is aleardy originated. */
/* Don't allow if the same lsa is already originated. */
if ((sameRtmap)
&& (red->dmetric.type == type)
&& (red->dmetric.value == metric)