diff options
author | David Lamparter <equinox@opensourcerouting.org> | 2024-01-25 19:37:26 +0100 |
---|---|---|
committer | David Lamparter <equinox@opensourcerouting.org> | 2024-01-27 19:02:52 +0100 |
commit | 567f5702c0ec53700388383030e55fee49459389 (patch) | |
tree | 1b6cd3d290553a48b974ec9412108c31e44c2c5d /ospf6d/ospf6_top.c | |
parent | ospfd: fix GR state location (diff) | |
download | frr-567f5702c0ec53700388383030e55fee49459389.tar.xz frr-567f5702c0ec53700388383030e55fee49459389.zip |
ospf6d: fix GR & auth seqno state location
Unfortunately, `ospf6d` is much worse than `ospfd` and `isisd` regarding
its state saving, due to the existence of the auth trailer code.
Again, this belongs in `/var/lib`, not `/var/run`.
Merge both state files into one, and add reconciliation code for the
auth seqno.
I'm gonna save my comment on the fact that `ospf6_auth_seqno_nvm_delete`
is not in fact used anywhere. Which is now a warning because it's
`static`. Well. It probably should be used somewhere, so leave it in.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospf6d/ospf6_top.c')
-rw-r--r-- | ospf6d/ospf6_top.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index 63672a96e..a3fb20537 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -430,17 +430,7 @@ static struct ospf6 *ospf6_create(const char *name) /* Make ospf protocol socket. */ ospf6_serv_sock(o); - /* If sequence number is stored in persistent storage, read it. - */ - if (ospf6_auth_nvm_file_exist() == OSPF6_AUTH_FILE_EXIST) { - ospf6_auth_seqno_nvm_read(o); - o->seqnum_h = o->seqnum_h + 1; - ospf6_auth_seqno_nvm_update(o); - } else { - o->seqnum_l = o->seqnum_h = 0; - ospf6_auth_seqno_nvm_update(o); - } - + ospf6_auth_init(o); return o; } |