diff options
author | Claudio Jeker <claudio@cvs.openbsd.org> | 2007-10-11 20:20:45 +0000 |
---|---|---|
committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2007-10-11 20:20:45 +0000 |
commit | 13854b6abbb2e8b8063228469888ef2105782890 (patch) | |
tree | 87b2d6ae510ff247ada87f104bc844d42c3b68f8 | |
parent | a082525262c3217c983e3cdc3f0349a634d4e6cb (diff) |
In OSPFv3 auth crypt is no longer (actually all the auth code is gone) so
kill crypt_seq_num as well.
-rw-r--r-- | usr.sbin/ospf6d/interface.c | 4 | ||||
-rw-r--r-- | usr.sbin/ospf6d/neighbor.c | 3 | ||||
-rw-r--r-- | usr.sbin/ospf6d/ospf6d.h | 3 | ||||
-rw-r--r-- | usr.sbin/ospf6d/ospfe.h | 3 |
4 files changed, 4 insertions, 9 deletions
diff --git a/usr.sbin/ospf6d/interface.c b/usr.sbin/ospf6d/interface.c index 8f9fc0ce733..6dc8b0d2e3e 100644 --- a/usr.sbin/ospf6d/interface.c +++ b/usr.sbin/ospf6d/interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interface.c,v 1.3 2007/10/09 06:33:17 claudio Exp $ */ +/* $OpenBSD: interface.c,v 1.4 2007/10/11 20:20:44 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -168,8 +168,6 @@ if_new(struct kif *kif, struct kif_addr *ka) LIST_INIT(&iface->nbr_list); TAILQ_INIT(&iface->ls_ack_list); - iface->crypt_seq_num = arc4random() & 0x0fffffff; - if (kif == NULL) { iface->type = IF_TYPE_VIRTUALLINK; snprintf(iface->name, sizeof(iface->name), "vlink%d", diff --git a/usr.sbin/ospf6d/neighbor.c b/usr.sbin/ospf6d/neighbor.c index a126d631c55..efd7182e879 100644 --- a/usr.sbin/ospf6d/neighbor.c +++ b/usr.sbin/ospf6d/neighbor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neighbor.c,v 1.2 2007/10/11 18:43:42 claudio Exp $ */ +/* $OpenBSD: neighbor.c,v 1.3 2007/10/11 20:20:44 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -595,7 +595,6 @@ nbr_act_delete(struct nbr *nbr) /* clear dr and bdr */ nbr->dr.s_addr = 0; nbr->bdr.s_addr = 0; - nbr->crypt_seq_num = 0; /* schedule kill timer */ timerclear(&tv); diff --git a/usr.sbin/ospf6d/ospf6d.h b/usr.sbin/ospf6d/ospf6d.h index be4952b0cda..97581fd96ba 100644 --- a/usr.sbin/ospf6d/ospf6d.h +++ b/usr.sbin/ospf6d/ospf6d.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ospf6d.h,v 1.5 2007/10/11 19:10:55 claudio Exp $ */ +/* $OpenBSD: ospf6d.h,v 1.6 2007/10/11 20:20:44 claudio Exp $ */ /* * Copyright (c) 2004, 2007 Esben Norby <norby@openbsd.org> @@ -327,7 +327,6 @@ struct iface { u_int64_t baudrate; u_int32_t ls_ack_cnt; - u_int32_t crypt_seq_num; time_t uptime; unsigned int ifindex; int fd; diff --git a/usr.sbin/ospf6d/ospfe.h b/usr.sbin/ospf6d/ospfe.h index d7b0d185aab..a46f10b8635 100644 --- a/usr.sbin/ospf6d/ospfe.h +++ b/usr.sbin/ospf6d/ospfe.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfe.h,v 1.6 2007/10/11 19:06:41 claudio Exp $ */ +/* $OpenBSD: ospfe.h,v 1.7 2007/10/11 20:20:44 claudio Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> @@ -82,7 +82,6 @@ struct nbr { u_int32_t peerid; /* unique ID in DB */ u_int32_t ls_req_cnt; u_int32_t ls_ret_cnt; - u_int32_t crypt_seq_num; u_int32_t options; u_int32_t last_rx_options; |