Use ospfe_imsg_compose_rde() instead of exporting iev_rde and using

imsg_compose_event() directly. This is needed to make the imsg event
structures static in ospfe.c, rde.c and ospf6d.c.

diff --git a/usr.sbin/ospf6d/lsreq.c b/usr.sbin/ospf6d/lsreq.c
index 55220a1..6596619 100644 (file)
--- a/usr.sbin/ospf6d/lsreq.c
+++ b/usr.sbin/ospf6d/lsreq.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: lsreq.c,v 1.11 2019/12/28 09:25:24 denis Exp $ */
+/*     $OpenBSD: lsreq.c,v 1.12 2021/01/19 09:53:11 claudio Exp $ */
 
 /*
  * Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org>
@@ -28,8 +28,6 @@
 #include "log.h"
 #include "ospfe.h"
 
-extern struct imsgev           *iev_rde;
-
 /* link state request packet handling */
 int
 send_ls_req(struct nbr *nbr)
@@ -104,8 +102,7 @@ recv_ls_req(struct nbr *nbr, char *buf, u_int16_t len)
        case NBR_STA_XCHNG:
        case NBR_STA_LOAD:
        case NBR_STA_FULL:
-               imsg_compose_event(iev_rde, IMSG_LS_REQ, nbr->peerid,
-                   0, -1, buf, len);
+               ospfe_imsg_compose_rde(IMSG_LS_REQ, nbr->peerid, 0, buf, len);
                break;
        default:
                fatalx("recv_ls_req: unknown neighbor state");

diff --git a/usr.sbin/ospf6d/lsupdate.c b/usr.sbin/ospf6d/lsupdate.c
index 989e56f..a7df58d 100644 (file)
--- a/usr.sbin/ospf6d/lsupdate.c
+++ b/usr.sbin/ospf6d/lsupdate.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: lsupdate.c,v 1.19 2021/01/12 09:51:10 claudio Exp $ */
+/*     $OpenBSD: lsupdate.c,v 1.20 2021/01/19 09:53:11 claudio Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -34,8 +34,6 @@
 #include "ospfe.h"
 #include "rde.h"
 
-extern struct imsgev           *iev_rde;
-
 struct ibuf    *prepare_ls_update(struct iface *, int);
 int             add_ls_update(struct ibuf *, struct iface *, void *, u_int16_t,
                    u_int16_t);
@@ -280,8 +278,8 @@ recv_ls_update(struct nbr *nbr, char *buf, u_int16_t len)
                                    "neighbor ID %s", inet_ntoa(nbr->id));
                                return;
                        }
-                       imsg_compose_event(iev_rde, IMSG_LS_UPD, nbr->peerid, 0,
-                           -1, buf, ntohs(lsa.len));
+                       ospfe_imsg_compose_rde(IMSG_LS_UPD, nbr->peerid, 0,
+                           buf, ntohs(lsa.len));
                        buf += ntohs(lsa.len);
                        len -= ntohs(lsa.len);
                }