summaryrefslogtreecommitdiffstats
path: root/bgpd
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@nvidia.com>2023-03-07 20:22:48 +0100
committerDonald Sharp <sharpd@nvidia.com>2023-03-24 13:32:17 +0100
commit24a58196ddcff2215d382d8a677c2dcdc898e03c (patch)
tree96e008127cbe222d07aefc8b31d2176f64a1e21a /bgpd
parent*: Convert `struct event_master` to `struct event_loop` (diff)
downloadfrr-24a58196ddcff2215d382d8a677c2dcdc898e03c.tar.xz
frr-24a58196ddcff2215d382d8a677c2dcdc898e03c.zip
*: Convert event.h to frrevent.h
We should probably prevent any type of namespace collision with something else. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'bgpd')
-rw-r--r--bgpd/bgp_advertise.c2
-rw-r--r--bgpd/bgp_bfd.c2
-rw-r--r--bgpd/bgp_bmp.c2
-rw-r--r--bgpd/bgp_damp.c2
-rw-r--r--bgpd/bgp_dump.c2
-rw-r--r--bgpd/bgp_fsm.c2
-rw-r--r--bgpd/bgp_io.c2
-rw-r--r--bgpd/bgp_label.c2
-rw-r--r--bgpd/bgp_main.c2
-rw-r--r--bgpd/bgp_mplsvpn_snmp.c2
-rw-r--r--bgpd/bgp_network.c2
-rw-r--r--bgpd/bgp_nexthop.c2
-rw-r--r--bgpd/bgp_nht.c2
-rw-r--r--bgpd/bgp_open.c2
-rw-r--r--bgpd/bgp_packet.c2
-rw-r--r--bgpd/bgp_route.c2
-rw-r--r--bgpd/bgp_rpki.c2
-rw-r--r--bgpd/bgp_snmp.c2
-rw-r--r--bgpd/bgp_snmp_bgp4.c2
-rw-r--r--bgpd/bgp_snmp_bgp4v2.c2
-rw-r--r--bgpd/bgp_updgrp.c2
-rw-r--r--bgpd/bgp_updgrp_adv.c2
-rw-r--r--bgpd/bgp_updgrp_packet.c2
-rw-r--r--bgpd/bgp_vty.c2
-rw-r--r--bgpd/bgp_zebra.c2
-rw-r--r--bgpd/bgpd.c2
-rw-r--r--bgpd/rfapi/rfapi_import.c2
-rw-r--r--bgpd/rfapi/rfapi_import.h2
-rw-r--r--bgpd/rfapi/vnc_export_table.h2
29 files changed, 29 insertions, 29 deletions
diff --git a/bgpd/bgp_advertise.c b/bgpd/bgp_advertise.c
index 429abc179..9686b08a9 100644
--- a/bgpd/bgp_advertise.c
+++ b/bgpd/bgp_advertise.c
@@ -9,7 +9,7 @@
#include "memory.h"
#include "prefix.h"
#include "hash.h"
-#include "event.h"
+#include "frrevent.h"
#include "queue.h"
#include "filter.h"
diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c
index 8923c1933..a51bcb1a1 100644
--- a/bgpd/bgp_bfd.c
+++ b/bgpd/bgp_bfd.c
@@ -11,7 +11,7 @@
#include "linklist.h"
#include "memory.h"
#include "prefix.h"
-#include "event.h"
+#include "frrevent.h"
#include "buffer.h"
#include "stream.h"
#include "vrf.h"
diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c
index 0dfb3a106..73dbf4ab2 100644
--- a/bgpd/bgp_bmp.c
+++ b/bgpd/bgp_bmp.c
@@ -11,7 +11,7 @@
#include "sockunion.h"
#include "command.h"
#include "prefix.h"
-#include "event.h"
+#include "frrevent.h"
#include "linklist.h"
#include "queue.h"
#include "pullwr.h"
diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c
index 419587ae1..a6d0e74dc 100644
--- a/bgpd/bgp_damp.c
+++ b/bgpd/bgp_damp.c
@@ -10,7 +10,7 @@
#include "memory.h"
#include "command.h"
#include "log.h"
-#include "event.h"
+#include "frrevent.h"
#include "queue.h"
#include "filter.h"
diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c
index d59e1925e..c78e740ec 100644
--- a/bgpd/bgp_dump.c
+++ b/bgpd/bgp_dump.c
@@ -10,7 +10,7 @@
#include "sockunion.h"
#include "command.h"
#include "prefix.h"
-#include "event.h"
+#include "frrevent.h"
#include "linklist.h"
#include "queue.h"
#include "memory.h"
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 9118be3a7..a289d3d67 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -9,7 +9,7 @@
#include "linklist.h"
#include "prefix.h"
#include "sockunion.h"
-#include "event.h"
+#include "frrevent.h"
#include "log.h"
#include "stream.h"
#include "ringbuf.h"
diff --git a/bgpd/bgp_io.c b/bgpd/bgp_io.c
index 56f01ab23..650adc1c9 100644
--- a/bgpd/bgp_io.c
+++ b/bgpd/bgp_io.c
@@ -17,7 +17,7 @@
#include "network.h" // for ERRNO_IO_RETRY
#include "stream.h" // for stream_get_endp, stream_getw_from, str...
#include "ringbuf.h" // for ringbuf_remain, ringbuf_peek, ringbuf_...
-#include "event.h" // for EVENT_OFF, EVENT_ARG, thread...
+#include "frrevent.h" // for EVENT_OFF, EVENT_ARG, thread...
#include "bgpd/bgp_io.h"
#include "bgpd/bgp_debug.h" // for bgp_debug_neighbor_events, bgp_type_str
diff --git a/bgpd/bgp_label.c b/bgpd/bgp_label.c
index c13e0b0da..0f3faeb29 100644
--- a/bgpd/bgp_label.c
+++ b/bgpd/bgp_label.c
@@ -6,7 +6,7 @@
#include <zebra.h>
#include "command.h"
-#include "event.h"
+#include "frrevent.h"
#include "prefix.h"
#include "zclient.h"
#include "stream.h"
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 63dab9070..074059c14 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -9,7 +9,7 @@
#include "vector.h"
#include "command.h"
#include "getopt.h"
-#include "event.h"
+#include "frrevent.h"
#include <lib/version.h>
#include "memory.h"
#include "prefix.h"
diff --git a/bgpd/bgp_mplsvpn_snmp.c b/bgpd/bgp_mplsvpn_snmp.c
index 52320031c..20fec6d77 100644
--- a/bgpd/bgp_mplsvpn_snmp.c
+++ b/bgpd/bgp_mplsvpn_snmp.c
@@ -12,7 +12,7 @@
#include "log.h"
#include "prefix.h"
#include "command.h"
-#include "event.h"
+#include "frrevent.h"
#include "smux.h"
#include "filter.h"
#include "hook.h"
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index f5fe9e0fd..78da7a42b 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -5,7 +5,7 @@
#include <zebra.h>
-#include "event.h"
+#include "frrevent.h"
#include "sockunion.h"
#include "sockopt.h"
#include "memory.h"
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index 2ccc5e2c3..c4b832ee5 100644
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -6,7 +6,7 @@
#include <zebra.h>
#include "command.h"
-#include "event.h"
+#include "frrevent.h"
#include "prefix.h"
#include "lib/json.h"
#include "zclient.h"
diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c
index 436e94412..a294ebcc6 100644
--- a/bgpd/bgp_nht.c
+++ b/bgpd/bgp_nht.c
@@ -6,7 +6,7 @@
#include <zebra.h>
#include "command.h"
-#include "event.h"
+#include "frrevent.h"
#include "prefix.h"
#include "zclient.h"
#include "stream.h"
diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 457f7be7e..e028fa3dc 100644
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -8,7 +8,7 @@
#include "linklist.h"
#include "prefix.h"
#include "stream.h"
-#include "event.h"
+#include "frrevent.h"
#include "log.h"
#include "command.h"
#include "memory.h"
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 6d3ca8aba..1c76828a2 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -8,7 +8,7 @@
#include <zebra.h>
#include <sys/time.h>
-#include "event.h"
+#include "frrevent.h"
#include "stream.h"
#include "network.h"
#include "prefix.h"
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 7296f63f7..07bec23b2 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -20,7 +20,7 @@
#include "buffer.h"
#include "sockunion.h"
#include "plist.h"
-#include "event.h"
+#include "frrevent.h"
#include "workqueue.h"
#include "queue.h"
#include "memory.h"
diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c
index 8e0944664..c6e3131e0 100644
--- a/bgpd/bgp_rpki.c
+++ b/bgpd/bgp_rpki.c
@@ -23,7 +23,7 @@
#include "command.h"
#include "linklist.h"
#include "memory.h"
-#include "event.h"
+#include "frrevent.h"
#include "filter.h"
#include "bgpd/bgpd.h"
#include "bgpd/bgp_table.h"
diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c
index f2b420724..ce9442c1e 100644
--- a/bgpd/bgp_snmp.c
+++ b/bgpd/bgp_snmp.c
@@ -12,7 +12,7 @@
#include "log.h"
#include "prefix.h"
#include "command.h"
-#include "event.h"
+#include "frrevent.h"
#include "smux.h"
#include "filter.h"
#include "hook.h"
diff --git a/bgpd/bgp_snmp_bgp4.c b/bgpd/bgp_snmp_bgp4.c
index 1c586ad56..123d33bd1 100644
--- a/bgpd/bgp_snmp_bgp4.c
+++ b/bgpd/bgp_snmp_bgp4.c
@@ -12,7 +12,7 @@
#include "log.h"
#include "prefix.h"
#include "command.h"
-#include "event.h"
+#include "frrevent.h"
#include "smux.h"
#include "filter.h"
#include "hook.h"
diff --git a/bgpd/bgp_snmp_bgp4v2.c b/bgpd/bgp_snmp_bgp4v2.c
index e2952ab3c..712b5d4af 100644
--- a/bgpd/bgp_snmp_bgp4v2.c
+++ b/bgpd/bgp_snmp_bgp4v2.c
@@ -13,7 +13,7 @@
#include "log.h"
#include "prefix.h"
#include "command.h"
-#include "event.h"
+#include "frrevent.h"
#include "smux.h"
#include "filter.h"
#include "hook.h"
diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c
index 69eda0dd9..72dca9f70 100644
--- a/bgpd/bgp_updgrp.c
+++ b/bgpd/bgp_updgrp.c
@@ -12,7 +12,7 @@
#include <zebra.h>
#include "prefix.h"
-#include "event.h"
+#include "frrevent.h"
#include "buffer.h"
#include "stream.h"
#include "command.h"
diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c
index e2fc9f68b..e4bc0176d 100644
--- a/bgpd/bgp_updgrp_adv.c
+++ b/bgpd/bgp_updgrp_adv.c
@@ -17,7 +17,7 @@
#include "memory.h"
#include "prefix.h"
#include "hash.h"
-#include "event.h"
+#include "frrevent.h"
#include "queue.h"
#include "routemap.h"
#include "filter.h"
diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c
index 279a7cce6..e04d5ae24 100644
--- a/bgpd/bgp_updgrp_packet.c
+++ b/bgpd/bgp_updgrp_packet.c
@@ -12,7 +12,7 @@
#include <zebra.h>
#include "prefix.h"
-#include "event.h"
+#include "frrevent.h"
#include "buffer.h"
#include "stream.h"
#include "command.h"
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 342d01866..4bbbced80 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -16,7 +16,7 @@
#include "buffer.h"
#include "linklist.h"
#include "stream.h"
-#include "event.h"
+#include "frrevent.h"
#include "log.h"
#include "memory.h"
#include "lib_vty.h"
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index f3b1b948c..3b17c99d6 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -13,7 +13,7 @@
#include "sockunion.h"
#include "zclient.h"
#include "routemap.h"
-#include "event.h"
+#include "frrevent.h"
#include "queue.h"
#include "memory.h"
#include "lib/json.h"
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index ae46efef2..cbed52068 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -6,7 +6,7 @@
#include <zebra.h>
#include "prefix.h"
-#include "event.h"
+#include "frrevent.h"
#include "buffer.h"
#include "stream.h"
#include "ringbuf.h"
diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c
index 73d7930b4..e6da79faf 100644
--- a/bgpd/rfapi/rfapi_import.c
+++ b/bgpd/rfapi/rfapi_import.c
@@ -15,7 +15,7 @@
#include "lib/memory.h"
#include "lib/log.h"
#include "lib/skiplist.h"
-#include "event.h"
+#include "frrevent.h"
#include "lib/stream.h"
#include "lib/lib_errors.h"
diff --git a/bgpd/rfapi/rfapi_import.h b/bgpd/rfapi/rfapi_import.h
index 7e021e8f7..dd06afe7e 100644
--- a/bgpd/rfapi/rfapi_import.h
+++ b/bgpd/rfapi/rfapi_import.h
@@ -13,7 +13,7 @@
#ifndef QUAGGA_HGP_RFAPI_IMPORT_H
#define QUAGGA_HGP_RFAPI_IMPORT_H
-#include "event.h"
+#include "frrevent.h"
/*
* These are per-rt-import-list
diff --git a/bgpd/rfapi/vnc_export_table.h b/bgpd/rfapi/vnc_export_table.h
index 957e0432e..f715de085 100644
--- a/bgpd/rfapi/vnc_export_table.h
+++ b/bgpd/rfapi/vnc_export_table.h
@@ -9,7 +9,7 @@
#define _QUAGGA_VNC_VNC_EXPORT_TABLE_H_
#include "lib/table.h"
-#include "event.h"
+#include "frrevent.h"
#include "lib/vty.h"
#include "bgpd/bgpd.h"