]> git.puffer.fish Git - matthieu/frr.git/commitdiff
vtysh: Print uniq lines when parsing `no service ...`
authorDonatas Abraitis <donatas@opensourcerouting.org>
Fri, 11 Aug 2023 15:21:12 +0000 (18:21 +0300)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Tue, 15 Aug 2023 20:28:16 +0000 (20:28 +0000)
Before this patch:

```
no service cputime-warning
no service cputime-warning
no ipv6 forwarding
no service cputime-warning
no service cputime-warning
no service cputime-warning
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 8fa9f2bc2af058650c60a574ff99783ca098c046)

vtysh/vtysh_config.c

index 593de7ffbc77a56777c10e299225b4ab52a0178f..685b5f56dacf579972b4468689c9ad225f245130 100644 (file)
@@ -484,8 +484,7 @@ void vtysh_config_parse_line(void *arg, const char *line)
                        config = config_get(RPKI_NODE, line);
                else {
                        if (strncmp(line, "log", strlen("log")) == 0 ||
-                           strncmp(line, "hostname", strlen("hostname")) ==
-                                   0 ||
+                           strncmp(line, "hostname", strlen("hostname")) == 0 ||
                            strncmp(line, "domainname", strlen("domainname")) ==
                                    0 ||
                            strncmp(line, "allow-reserved-ranges",
@@ -497,12 +496,9 @@ void vtysh_config_parse_line(void *arg, const char *line)
                                    strlen("no ip prefix-list")) == 0 ||
                            strncmp(line, "no ipv6 prefix-list",
                                    strlen("no ipv6 prefix-list")) == 0 ||
-                           strncmp(line, "service ", strlen("service ")) ==
-                                   0 ||
-                           strncmp(line, "no service cputime-stats",
-                                   strlen("no service cputime-stats")) == 0 ||
-                           strncmp(line, "service cputime-warning",
-                                   strlen("service cputime-warning")) == 0)
+                           strncmp(line, "service ", strlen("service ")) == 0 ||
+                           strncmp(line, "no service ",
+                                   strlen("no service ")) == 0)
                                config_add_line_uniq(config_top, line);
                        else
                                config_add_line(config_top, line);