diff options
| author | denis <denis@cvs.openbsd.org> | 2020-05-16 15:53:04 +0000 |
|---|---|---|
| committer | denis <denis@cvs.openbsd.org> | 2020-05-16 15:53:04 +0000 |
| commit | 1c3298ebc8a1ded143e67bc4b936b8b488c39e35 (patch) | |
| tree | 6aea8a4549762f774c9f2fd6bceeb87635e5a07f | |
| parent | bdaee778bc193eeb3f3772c21c3ec29ed9608370 (diff) | |
IMSG_IFADD is never used, wipe it
OK remi@
| -rw-r--r-- | usr.sbin/ospf6d/ospf6d.h | 3 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/ospfe.c | 14 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/rde.c | 13 |
3 files changed, 3 insertions, 27 deletions
diff --git a/usr.sbin/ospf6d/ospf6d.h b/usr.sbin/ospf6d/ospf6d.h index 797d3cd8e43..5d4a243b4c7 100644 --- a/usr.sbin/ospf6d/ospf6d.h +++ b/usr.sbin/ospf6d/ospf6d.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ospf6d.h,v 1.46 2020/04/05 18:19:04 denis Exp $ */ +/* $OpenBSD: ospf6d.h,v 1.47 2020/05/16 15:53:03 denis Exp $ */ /* * Copyright (c) 2004, 2007 Esben Norby <norby@openbsd.org> @@ -103,7 +103,6 @@ enum imsg_type { IMSG_KROUTE_CHANGE, IMSG_KROUTE_DELETE, IMSG_IFINFO, - IMSG_IFADD, IMSG_IFDELETE, IMSG_IFADDRNEW, IMSG_IFADDRDEL, diff --git a/usr.sbin/ospf6d/ospfe.c b/usr.sbin/ospf6d/ospfe.c index 07413f2807e..b6f8a2b4a9f 100644 --- a/usr.sbin/ospf6d/ospfe.c +++ b/usr.sbin/ospf6d/ospfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfe.c,v 1.61 2020/01/02 10:16:46 denis Exp $ */ +/* $OpenBSD: ospfe.c,v 1.62 2020/05/16 15:53:03 denis Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -327,18 +327,6 @@ ospfe_dispatch_main(int fd, short event, void *bula) log_warnx("interface %s down", iface->name); } break; - case IMSG_IFADD: - if ((iface = malloc(sizeof(struct iface))) == NULL) - fatal(NULL); - memcpy(iface, imsg.data, sizeof(struct iface)); - - LIST_INIT(&iface->nbr_list); - TAILQ_INIT(&iface->ls_ack_list); - RB_INIT(&iface->lsa_tree); - - LIST_INSERT_HEAD(&iface->area->iface_list, iface, - entry); - break; case IMSG_IFDELETE: if (imsg.hdr.len != IMSG_HEADER_SIZE + sizeof(ifindex)) diff --git a/usr.sbin/ospf6d/rde.c b/usr.sbin/ospf6d/rde.c index c1f8e746888..62d259fc689 100644 --- a/usr.sbin/ospf6d/rde.c +++ b/usr.sbin/ospf6d/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.86 2020/04/05 18:19:04 denis Exp $ */ +/* $OpenBSD: rde.c,v 1.87 2020/05/16 15:53:03 denis Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -734,17 +734,6 @@ rde_dispatch_parent(int fd, short event, void *bula) orig_intra_area_prefix_lsas(iface->area); break; - case IMSG_IFADD: - if ((iface = malloc(sizeof(struct iface))) == NULL) - fatal(NULL); - memcpy(iface, imsg.data, sizeof(struct iface)); - - LIST_INIT(&iface->nbr_list); - TAILQ_INIT(&iface->ls_ack_list); - RB_INIT(&iface->lsa_tree); - - LIST_INSERT_HEAD(&iface->area->iface_list, iface, entry); - break; case IMSG_IFDELETE: if (imsg.hdr.len != IMSG_HEADER_SIZE + sizeof(ifindex)) |