diff options
229 files changed, 232 insertions, 232 deletions
diff --git a/babeld/babel_main.c b/babeld/babel_main.c index 574a35887..b6126d5b7 100644 --- a/babeld/babel_main.c +++ b/babeld/babel_main.c @@ -8,7 +8,7 @@ Copyright 2011 by Matthieu Boutier and Juliusz Chroboczek #include "getopt.h" #include "if.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "privs.h" #include "sigevent.h" #include "lib/version.h" diff --git a/babeld/kernel.c b/babeld/kernel.c index bbbb9676e..4fe5bcfea 100644 --- a/babeld/kernel.c +++ b/babeld/kernel.c @@ -29,7 +29,7 @@ Copyright 2011, 2012 by Matthieu Boutier and Juliusz Chroboczek #include "command.h" #include "vty.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "nexthop.h" #include "util.h" diff --git a/bfdd/dplane.c b/bfdd/dplane.c index 92e9466a1..d8539812e 100644 --- a/bfdd/dplane.c +++ b/bfdd/dplane.c @@ -26,7 +26,7 @@ #include "lib/network.h" #include "lib/printfrr.h" #include "lib/stream.h" -#include "lib/event.h" +#include "lib/frrevent.h" #include "bfd.h" #include "bfddp_packet.h" 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" diff --git a/doc/developer/modules.rst b/doc/developer/modules.rst index 647b96aa0..0feac8e73 100644 --- a/doc/developer/modules.rst +++ b/doc/developer/modules.rst @@ -56,7 +56,7 @@ Basic boilerplate: #include "hook.h" #include "module.h" #include "libfrr.h" - #include "event.h" + #include "frrevent.h" static int module_late_init(struct event_loop *master) { diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c index 8afc34369..2ebabd0ef 100644 --- a/eigrpd/eigrp_dump.c +++ b/eigrpd/eigrp_dump.c @@ -13,7 +13,7 @@ #include <zebra.h> #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "command.h" #include "stream.h" diff --git a/eigrpd/eigrp_filter.c b/eigrpd/eigrp_filter.c index b56380f0e..eceef6b8a 100644 --- a/eigrpd/eigrp_filter.c +++ b/eigrpd/eigrp_filter.c @@ -21,7 +21,7 @@ #include "command.h" #include "prefix.h" #include "table.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "log.h" #include "stream.h" diff --git a/eigrpd/eigrp_fsm.c b/eigrpd/eigrp_fsm.c index cdfc99fce..6d8061e57 100644 --- a/eigrpd/eigrp_fsm.c +++ b/eigrpd/eigrp_fsm.c @@ -54,7 +54,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "table.h" #include "memory.h" diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c index d8cc4a45e..662c750e9 100644 --- a/eigrpd/eigrp_hello.c +++ b/eigrpd/eigrp_hello.c @@ -16,7 +16,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_interface.c b/eigrpd/eigrp_interface.c index e983f46cc..2381977db 100644 --- a/eigrpd/eigrp_interface.c +++ b/eigrpd/eigrp_interface.c @@ -16,7 +16,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c index 0ccc9810a..6d7443b79 100644 --- a/eigrpd/eigrp_main.c +++ b/eigrpd/eigrp_main.c @@ -17,7 +17,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/eigrpd/eigrp_neighbor.c b/eigrpd/eigrp_neighbor.c index 667fb02ce..25209c3bb 100644 --- a/eigrpd/eigrp_neighbor.c +++ b/eigrpd/eigrp_neighbor.c @@ -20,7 +20,7 @@ #include "prefix.h" #include "memory.h" #include "command.h" -#include "event.h" +#include "frrevent.h" #include "stream.h" #include "table.h" #include "log.h" diff --git a/eigrpd/eigrp_network.c b/eigrpd/eigrp_network.c index 4e5580480..ef567fe4e 100644 --- a/eigrpd/eigrp_network.c +++ b/eigrpd/eigrp_network.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c index 8c3e75228..963d229bc 100644 --- a/eigrpd/eigrp_packet.c +++ b/eigrpd/eigrp_packet.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "vty.h" diff --git a/eigrpd/eigrp_query.c b/eigrpd/eigrp_query.c index 7e21eb79a..0e206cded 100644 --- a/eigrpd/eigrp_query.c +++ b/eigrpd/eigrp_query.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c index 07d1fd75d..aae89e832 100644 --- a/eigrpd/eigrp_reply.c +++ b/eigrpd/eigrp_reply.c @@ -16,7 +16,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_siaquery.c b/eigrpd/eigrp_siaquery.c index f4ddf1da3..71486a1f6 100644 --- a/eigrpd/eigrp_siaquery.c +++ b/eigrpd/eigrp_siaquery.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_siareply.c b/eigrpd/eigrp_siareply.c index aaea1df77..6c8c1ef58 100644 --- a/eigrpd/eigrp_siareply.c +++ b/eigrpd/eigrp_siareply.c @@ -11,7 +11,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_snmp.c b/eigrpd/eigrp_snmp.c index efa72e3a0..492ef3e71 100644 --- a/eigrpd/eigrp_snmp.c +++ b/eigrpd/eigrp_snmp.c @@ -16,7 +16,7 @@ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_update.c b/eigrpd/eigrp_update.c index fb39c6efd..2237a611e 100644 --- a/eigrpd/eigrp_update.c +++ b/eigrpd/eigrp_update.c @@ -16,7 +16,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_vty.c b/eigrpd/eigrp_vty.c index c4dba8bc3..88510e75a 100644 --- a/eigrpd/eigrp_vty.c +++ b/eigrpd/eigrp_vty.c @@ -17,7 +17,7 @@ #include <zebra.h> #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "table.h" #include "vty.h" diff --git a/eigrpd/eigrp_zebra.c b/eigrpd/eigrp_zebra.c index 70365adad..94c2bcab7 100644 --- a/eigrpd/eigrp_zebra.c +++ b/eigrpd/eigrp_zebra.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/eigrpd/eigrpd.c b/eigrpd/eigrpd.c index 58241b5f1..c7dd96bff 100644 --- a/eigrpd/eigrpd.c +++ b/eigrpd/eigrpd.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "linklist.h" diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c index c7c958292..1871078cc 100644 --- a/isisd/isis_adjacency.c +++ b/isisd/isis_adjacency.c @@ -15,7 +15,7 @@ #include "hash.h" #include "vty.h" #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "if.h" #include "stream.h" #include "bfd.h" diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index 8d6239074..124dcdd86 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -19,7 +19,7 @@ #include "if.h" #include "linklist.h" #include "command.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "hash.h" #include "prefix.h" diff --git a/isisd/isis_csm.c b/isisd/isis_csm.c index 2b460e10c..9e278d47f 100644 --- a/isisd/isis_csm.c +++ b/isisd/isis_csm.c @@ -14,7 +14,7 @@ #include "if.h" #include "linklist.h" #include "command.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "prefix.h" #include "stream.h" diff --git a/isisd/isis_dr.c b/isisd/isis_dr.c index 3bc188273..3b9216080 100644 --- a/isisd/isis_dr.c +++ b/isisd/isis_dr.c @@ -13,7 +13,7 @@ #include "log.h" #include "hash.h" -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "stream.h" diff --git a/isisd/isis_dynhn.c b/isisd/isis_dynhn.c index 469f332be..446e52201 100644 --- a/isisd/isis_dynhn.c +++ b/isisd/isis_dynhn.c @@ -16,7 +16,7 @@ #include "stream.h" #include "command.h" #include "if.h" -#include "event.h" +#include "frrevent.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" diff --git a/isisd/isis_events.c b/isisd/isis_events.c index 708a2747f..8a2a2ab97 100644 --- a/isisd/isis_events.c +++ b/isisd/isis_events.c @@ -13,7 +13,7 @@ #include "if.h" #include "linklist.h" #include "command.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "prefix.h" #include "stream.h" diff --git a/isisd/isis_ldp_sync.c b/isisd/isis_ldp_sync.c index 59596e1af..53676ffe3 100644 --- a/isisd/isis_ldp_sync.c +++ b/isisd/isis_ldp_sync.c @@ -9,7 +9,7 @@ #include "monotime.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "table.h" #include "vty.h" diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c index 32540b0fa..d569f6bd5 100644 --- a/isisd/isis_lsp.c +++ b/isisd/isis_lsp.c @@ -12,7 +12,7 @@ #include <zebra.h> #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "stream.h" #include "memory.h" diff --git a/isisd/isis_main.c b/isisd/isis_main.c index 65d1206c1..2f4e4e0bd 100644 --- a/isisd/isis_main.c +++ b/isisd/isis_main.c @@ -10,7 +10,7 @@ #include <zebra.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "log.h" #include <lib/version.h> #include "command.h" diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c index a5d5679c0..dd442840d 100644 --- a/isisd/isis_pdu.c +++ b/isisd/isis_pdu.c @@ -11,7 +11,7 @@ #include <zebra.h> #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "log.h" #include "stream.h" diff --git a/isisd/isis_route.c b/isisd/isis_route.c index 57f597212..3b653194b 100644 --- a/isisd/isis_route.c +++ b/isisd/isis_route.c @@ -11,7 +11,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "log.h" diff --git a/isisd/isis_routemap.c b/isisd/isis_routemap.c index 6d2a1f159..9be133c78 100644 --- a/isisd/isis_routemap.c +++ b/isisd/isis_routemap.c @@ -18,7 +18,7 @@ #include "plist.h" #include "routemap.h" #include "table.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "isis_constants.h" diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c index f63b00006..bfe3758cd 100644 --- a/isisd/isis_spf.c +++ b/isisd/isis_spf.c @@ -11,7 +11,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "log.h" diff --git a/isisd/isis_te.c b/isisd/isis_te.c index 9d859c222..45d763fd6 100644 --- a/isisd/isis_te.c +++ b/isisd/isis_te.c @@ -13,7 +13,7 @@ #include <math.h> #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "stream.h" #include "memory.h" diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c index 8a279558a..8cd8f57c4 100644 --- a/isisd/isis_zebra.c +++ b/isisd/isis_zebra.c @@ -10,7 +10,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "command.h" #include "memory.h" #include "log.h" diff --git a/isisd/isisd.c b/isisd/isisd.c index 20a48a03f..d216d100e 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -9,7 +9,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "log.h" diff --git a/ldpd/ldpd.h b/ldpd/ldpd.h index 9de3ea4a5..1fec5beaf 100644 --- a/ldpd/ldpd.h +++ b/ldpd/ldpd.h @@ -14,7 +14,7 @@ #include "queue.h" #include "openbsd-tree.h" #include "imsg.h" -#include "event.h" +#include "frrevent.h" #include "qobj.h" #include "prefix.h" #include "filter.h" @@ -10,7 +10,7 @@ #include "command.h" #include "memory.h" #include "prefix.h" -#include "event.h" +#include "frrevent.h" #include "stream.h" #include "vrf.h" #include "zclient.h" diff --git a/lib/command.c b/lib/command.c index be766f7cd..97ea200ff 100644 --- a/lib/command.c +++ b/lib/command.c @@ -17,7 +17,7 @@ #include "memory.h" #include "log.h" #include "log_vty.h" -#include "event.h" +#include "frrevent.h" #include "vector.h" #include "linklist.h" #include "vty.h" diff --git a/lib/event.c b/lib/event.c index f95e98a7f..9d3378b9b 100644 --- a/lib/event.c +++ b/lib/event.c @@ -8,7 +8,7 @@ #include <zebra.h> #include <sys/resource.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "frrcu.h" #include "log.h" diff --git a/lib/frr_pthread.h b/lib/frr_pthread.h index 36d0bdae8..f91044dfa 100644 --- a/lib/frr_pthread.h +++ b/lib/frr_pthread.h @@ -11,7 +11,7 @@ #include "frratomic.h" #include "memory.h" #include "frrcu.h" -#include "event.h" +#include "frrevent.h" #ifdef __cplusplus extern "C" { diff --git a/lib/frr_zmq.c b/lib/frr_zmq.c index 0b17e781e..b28dd7f1b 100644 --- a/lib/frr_zmq.c +++ b/lib/frr_zmq.c @@ -15,7 +15,7 @@ #include <zebra.h> #include <zmq.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "frr_zmq.h" #include "log.h" diff --git a/lib/frr_zmq.h b/lib/frr_zmq.h index 44f209b25..73da3770f 100644 --- a/lib/frr_zmq.h +++ b/lib/frr_zmq.h @@ -7,7 +7,7 @@ #ifndef _FRRZMQ_H #define _FRRZMQ_H -#include "event.h" +#include "frrevent.h" #include <zmq.h> #ifdef __cplusplus diff --git a/lib/event.h b/lib/frrevent.h index 107949900..b05885a98 100644 --- a/lib/event.h +++ b/lib/frrevent.h @@ -33,7 +33,7 @@ struct rusage_t { #endif struct timeval real; }; -#define RUSAGE_T struct rusage_t +#define RUSAGE_T struct rusage_t #define GETRUSAGE(X) event_getrusage(X) @@ -118,10 +118,10 @@ struct event { struct timeval sands; /* rest of time sands value. */ } u; struct timeval real; - struct cpu_event_history *hist; /* cache pointer to cpu_history */ - unsigned long yield; /* yield time in microseconds */ + struct cpu_event_history *hist; /* cache pointer to cpu_history */ + unsigned long yield; /* yield time in microseconds */ const struct xref_eventsched *xref; /* origin location */ - pthread_mutex_t mtx; /* mutex for thread.c functions */ + pthread_mutex_t mtx; /* mutex for thread.c functions */ bool ignore_timer_late; }; diff --git a/lib/ldp_sync.c b/lib/ldp_sync.c index b0608c391..d55819dfa 100644 --- a/lib/ldp_sync.c +++ b/lib/ldp_sync.c @@ -10,7 +10,7 @@ #include "memory.h" #include "prefix.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "stream.h" #include "zclient.h" #include "table.h" diff --git a/lib/libfrr.h b/lib/libfrr.h index a60580e1d..c05bc01e4 100644 --- a/lib/libfrr.h +++ b/lib/libfrr.h @@ -11,7 +11,7 @@ #include "typesafe.h" #include "sigevent.h" #include "privs.h" -#include "event.h" +#include "frrevent.h" #include "log.h" #include "getopt.h" #include "module.h" diff --git a/lib/libfrr_trace.h b/lib/libfrr_trace.h index 4d25f5580..05c958fa4 100644 --- a/lib/libfrr_trace.h +++ b/lib/libfrr_trace.h @@ -21,7 +21,7 @@ #include <lttng/tracepoint.h> #include "hash.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "table.h" diff --git a/lib/mgmt_fe_client.h b/lib/mgmt_fe_client.h index 2269a72ac..aa3371f03 100644 --- a/lib/mgmt_fe_client.h +++ b/lib/mgmt_fe_client.h @@ -13,7 +13,7 @@ extern "C" { #endif #include "mgmt_pb.h" -#include "event.h" +#include "frrevent.h" #include "mgmtd/mgmt_defines.h" /*************************************************************** diff --git a/lib/mgmt_msg.c b/lib/mgmt_msg.c index e7564f268..3f55f8202 100644 --- a/lib/mgmt_msg.c +++ b/lib/mgmt_msg.c @@ -10,7 +10,7 @@ #include "network.h" #include "sockopt.h" #include "stream.h" -#include "event.h" +#include "frrevent.h" #include "mgmt_msg.h" diff --git a/lib/mgmt_msg.h b/lib/mgmt_msg.h index 90dab8da7..e2dd2d476 100644 --- a/lib/mgmt_msg.h +++ b/lib/mgmt_msg.h @@ -8,7 +8,7 @@ #define _MGMT_MSG_H #include "stream.h" -#include "event.h" +#include "frrevent.h" #define MGMT_MSG_MARKER (0x4D724B21u) /* ASCII - "MrK!"*/ diff --git a/lib/northbound.h b/lib/northbound.h index 59703363b..1723a87e4 100644 --- a/lib/northbound.h +++ b/lib/northbound.h @@ -7,7 +7,7 @@ #ifndef _FRR_NORTHBOUND_H_ #define _FRR_NORTHBOUND_H_ -#include "event.h" +#include "frrevent.h" #include "hook.h" #include "linklist.h" #include "openbsd-tree.h" diff --git a/lib/northbound_grpc.cpp b/lib/northbound_grpc.cpp index 5ce80fb5f..6c33351ce 100644 --- a/lib/northbound_grpc.cpp +++ b/lib/northbound_grpc.cpp @@ -12,7 +12,7 @@ #include "log.h" #include "libfrr.h" #include "lib/version.h" -#include "event.h" +#include "frrevent.h" #include "command.h" #include "lib_errors.h" #include "northbound.h" diff --git a/lib/pullwr.h b/lib/pullwr.h index a589389c3..ef2e01c04 100644 --- a/lib/pullwr.h +++ b/lib/pullwr.h @@ -10,7 +10,7 @@ #include <stdbool.h> #include <stdint.h> -#include "event.h" +#include "frrevent.h" #include "stream.h" #ifdef __cplusplus diff --git a/lib/qobj.c b/lib/qobj.c index 6ebdcbf9c..b9630e754 100644 --- a/lib/qobj.c +++ b/lib/qobj.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "log.h" diff --git a/lib/resolver.c b/lib/resolver.c index d5915040b..99bf356eb 100644 --- a/lib/resolver.c +++ b/lib/resolver.c @@ -12,7 +12,7 @@ #include "typesafe.h" #include "jhash.h" -#include "event.h" +#include "frrevent.h" #include "lib_errors.h" #include "resolver.h" #include "command.h" diff --git a/lib/resolver.h b/lib/resolver.h index aba4e16c0..87e8ecdc4 100644 --- a/lib/resolver.h +++ b/lib/resolver.h @@ -6,7 +6,7 @@ #ifndef _FRR_RESOLVER_H #define _FRR_RESOLVER_H -#include "event.h" +#include "frrevent.h" #include "sockunion.h" #ifdef __cplusplus diff --git a/lib/sigevent.h b/lib/sigevent.h index 34753e1fd..0b07f594c 100644 --- a/lib/sigevent.h +++ b/lib/sigevent.h @@ -8,7 +8,7 @@ #ifndef _FRR_SIGNAL_H #define _FRR_SIGNAL_H -#include <event.h> +#include <frrevent.h> #ifdef __cplusplus extern "C" { diff --git a/lib/smux.h b/lib/smux.h index 366bf6fea..cec4d2a1b 100644 --- a/lib/smux.h +++ b/lib/smux.h @@ -9,7 +9,7 @@ #include <net-snmp/agent/net-snmp-agent-includes.h> #include <net-snmp/agent/snmp_vars.h> -#include "event.h" +#include "frrevent.h" #include "hook.h" #ifdef __cplusplus diff --git a/lib/spf_backoff.c b/lib/spf_backoff.c index ab9c94445..1053d8f69 100644 --- a/lib/spf_backoff.c +++ b/lib/spf_backoff.c @@ -17,7 +17,7 @@ #include "command.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF, "SPF backoff"); diff --git a/lib/subdir.am b/lib/subdir.am index 9f2f4033f..469fac244 100644 --- a/lib/subdir.am +++ b/lib/subdir.am @@ -288,7 +288,7 @@ pkginclude_HEADERS += \ lib/systemd.h \ lib/table.h \ lib/termtable.h \ - lib/event.h \ + lib/frrevent.h \ lib/trace.h \ lib/typerb.h \ lib/typesafe.h \ diff --git a/lib/systemd.c b/lib/systemd.c index bd364ad66..56a53a6e7 100644 --- a/lib/systemd.c +++ b/lib/systemd.c @@ -7,7 +7,7 @@ #include <zebra.h> #include <sys/un.h> -#include "event.h" +#include "frrevent.h" #include "systemd.h" #include "lib_errors.h" @@ -22,7 +22,7 @@ #include <stdio.h> #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "buffer.h" #include "command.h" #include "sockunion.h" @@ -18,7 +18,7 @@ #include <regex.h> #endif /* HAVE_LIBPCRE2_POSIX */ -#include "event.h" +#include "frrevent.h" #include "log.h" #include "sockunion.h" #include "qobj.h" diff --git a/lib/wheel.c b/lib/wheel.c index d9362bac4..e17995c64 100644 --- a/lib/wheel.c +++ b/lib/wheel.c @@ -6,7 +6,7 @@ */ #include "zebra.h" #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "wheel.h" #include "log.h" diff --git a/lib/workqueue.c b/lib/workqueue.c index 3b677e008..fa5d58536 100644 --- a/lib/workqueue.c +++ b/lib/workqueue.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "workqueue.h" #include "linklist.h" diff --git a/lib/zclient.c b/lib/zclient.c index d708a711a..95093a56f 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -14,7 +14,7 @@ #include "vrf_int.h" #include "if.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "zclient.h" #include "memory.h" #include "table.h" diff --git a/lib/zlog.c b/lib/zlog.c index 618325d09..309a955fa 100644 --- a/lib/zlog.c +++ b/lib/zlog.c @@ -48,7 +48,7 @@ #include "frrcu.h" #include "zlog.h" #include "libfrr_trace.h" -#include "event.h" +#include "frrevent.h" DEFINE_MTYPE_STATIC(LIB, LOG_MESSAGE, "log message"); DEFINE_MTYPE_STATIC(LIB, LOG_TLSBUF, "log thread-local buffer"); diff --git a/lib/zlog_5424.c b/lib/zlog_5424.c index 984ab5d1f..c15bdece2 100644 --- a/lib/zlog_5424.c +++ b/lib/zlog_5424.c @@ -26,7 +26,7 @@ #include "frr_pthread.h" #include "command.h" #include "monotime.h" -#include "event.h" +#include "frrevent.h" #include "lib/version.h" #include "lib/lib_errors.h" diff --git a/mgmtd/mgmt_be_adapter.c b/mgmtd/mgmt_be_adapter.c index c85b3549b..e0ab2cab8 100644 --- a/mgmtd/mgmt_be_adapter.c +++ b/mgmtd/mgmt_be_adapter.c @@ -7,7 +7,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "sockopt.h" #include "network.h" #include "libfrr.h" diff --git a/mgmtd/mgmt_history.c b/mgmtd/mgmt_history.c index 600a5f564..59b536215 100644 --- a/mgmtd/mgmt_history.c +++ b/mgmtd/mgmt_history.c @@ -7,7 +7,7 @@ #include <zebra.h> #include "md5.h" -#include "event.h" +#include "frrevent.h" #include "xref.h" #include "mgmt_fe_client.h" diff --git a/nhrpd/netlink_arp.c b/nhrpd/netlink_arp.c index 845d454d1..2e22f8e24 100644 --- a/nhrpd/netlink_arp.c +++ b/nhrpd/netlink_arp.c @@ -14,7 +14,7 @@ #include <linux/neighbour.h> #include <linux/netfilter/nfnetlink_log.h> -#include "event.h" +#include "frrevent.h" #include "stream.h" #include "prefix.h" #include "nhrpd.h" diff --git a/nhrpd/nhrp_cache.c b/nhrpd/nhrp_cache.c index f41c0afc5..1a11e0d98 100644 --- a/nhrpd/nhrp_cache.c +++ b/nhrpd/nhrp_cache.c @@ -5,7 +5,7 @@ #include "zebra.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "nhrpd.h" diff --git a/nhrpd/nhrp_event.c b/nhrpd/nhrp_event.c index 59bb62d28..ba318581d 100644 --- a/nhrpd/nhrp_event.c +++ b/nhrpd/nhrp_event.c @@ -11,7 +11,7 @@ #include <sys/socket.h> #include <sys/un.h> -#include "event.h" +#include "frrevent.h" #include "zbuf.h" #include "log.h" #include "nhrpd.h" diff --git a/nhrpd/nhrp_interface.c b/nhrpd/nhrp_interface.c index 7a0c3ba49..7c84fde36 100644 --- a/nhrpd/nhrp_interface.c +++ b/nhrpd/nhrp_interface.c @@ -11,7 +11,7 @@ #include "zebra.h" #include "linklist.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "nhrpd.h" #include "os.h" diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c index f34020bc6..593498ca1 100644 --- a/nhrpd/nhrp_main.c +++ b/nhrpd/nhrp_main.c @@ -12,7 +12,7 @@ #include "zebra.h" #include "privs.h" #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "sigevent.h" #include "lib/version.h" #include "log.h" diff --git a/nhrpd/nhrp_multicast.c b/nhrpd/nhrp_multicast.c index 71f27ac21..fdc1a31f2 100644 --- a/nhrpd/nhrp_multicast.c +++ b/nhrpd/nhrp_multicast.c @@ -18,7 +18,7 @@ #include <sys/types.h> #include <sys/socket.h> -#include "event.h" +#include "frrevent.h" #include "nhrpd.h" #include "netlink.h" #include "znl.h" diff --git a/nhrpd/nhrp_nhs.c b/nhrpd/nhrp_nhs.c index 063e7bbf8..b2af0da42 100644 --- a/nhrpd/nhrp_nhs.c +++ b/nhrpd/nhrp_nhs.c @@ -6,7 +6,7 @@ #include "zebra.h" #include "zbuf.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "nhrpd.h" #include "nhrp_protocol.h" diff --git a/nhrpd/nhrp_packet.c b/nhrpd/nhrp_packet.c index 3366a64b4..9d0b30cfe 100644 --- a/nhrpd/nhrp_packet.c +++ b/nhrpd/nhrp_packet.c @@ -10,7 +10,7 @@ #include <netinet/if_ether.h> #include "nhrpd.h" #include "zbuf.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "nhrp_protocol.h" diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c index f41a7d314..ffb6cf750 100644 --- a/nhrpd/nhrp_peer.c +++ b/nhrpd/nhrp_peer.c @@ -11,7 +11,7 @@ #include "zebra.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "network.h" diff --git a/nhrpd/nhrp_shortcut.c b/nhrpd/nhrp_shortcut.c index 5a141022d..04dad2aea 100644 --- a/nhrpd/nhrp_shortcut.c +++ b/nhrpd/nhrp_shortcut.c @@ -10,7 +10,7 @@ #include "nhrpd.h" #include "table.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "log.h" #include "nhrp_protocol.h" diff --git a/nhrpd/nhrp_vc.c b/nhrpd/nhrp_vc.c index 65e9af854..2c3201438 100644 --- a/nhrpd/nhrp_vc.c +++ b/nhrpd/nhrp_vc.c @@ -7,7 +7,7 @@ #include "memory.h" #include "stream.h" #include "hash.h" -#include "event.h" +#include "frrevent.h" #include "jhash.h" #include "nhrpd.h" diff --git a/nhrpd/vici.c b/nhrpd/vici.c index c72f3a86f..2f7636260 100644 --- a/nhrpd/vici.c +++ b/nhrpd/vici.c @@ -11,7 +11,7 @@ #include <sys/socket.h> #include <sys/un.h> -#include "event.h" +#include "frrevent.h" #include "zbuf.h" #include "log.h" #include "lib_errors.h" diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c index 407de01c5..f4202a4a2 100644 --- a/ospf6d/ospf6_abr.c +++ b/ospf6d/ospf6_abr.c @@ -12,7 +12,7 @@ #include "vty.h" #include "linklist.h" #include "command.h" -#include "event.h" +#include "frrevent.h" #include "plist.h" #include "filter.h" diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c index 0a4d3e957..69c711bf0 100644 --- a/ospf6d/ospf6_area.c +++ b/ospf6d/ospf6_area.c @@ -8,7 +8,7 @@ #include "log.h" #include "memory.h" #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "if.h" diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index 57b5fafa9..713dd8207 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -13,7 +13,7 @@ #include "routemap.h" #include "table.h" #include "plist.h" -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "lib/northbound_cli.h" diff --git a/ospf6d/ospf6_bfd.c b/ospf6d/ospf6_bfd.c index 1f3c4be4d..6379f9d99 100644 --- a/ospf6d/ospf6_bfd.c +++ b/ospf6d/ospf6_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 "zclient.h" diff --git a/ospf6d/ospf6_flood.c b/ospf6d/ospf6_flood.c index 9e482e751..a81d5222d 100644 --- a/ospf6d/ospf6_flood.c +++ b/ospf6d/ospf6_flood.c @@ -6,7 +6,7 @@ #include <zebra.h> #include "log.h" -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "command.h" diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 617a4a235..e7148d66b 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -9,7 +9,7 @@ #include "if.h" #include "log.h" #include "command.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "plist.h" #include "zclient.h" diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c index a8c12f8a5..301fccecd 100644 --- a/ospf6d/ospf6_intra.c +++ b/ospf6d/ospf6_intra.c @@ -7,7 +7,7 @@ #include "log.h" #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "if.h" #include "prefix.h" diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c index 708aaec89..2b806afe0 100644 --- a/ospf6d/ospf6_lsa.c +++ b/ospf6d/ospf6_lsa.c @@ -12,7 +12,7 @@ #include "vty.h" #include "command.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "checksum.h" #include "frrstr.h" diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index 599ee76a4..fdb93475d 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -9,7 +9,7 @@ #include <stdlib.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "log.h" #include "command.h" #include "vty.h" diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c index 69ac2f3b6..14b02dac7 100644 --- a/ospf6d/ospf6_message.c +++ b/ospf6d/ospf6_message.c @@ -9,7 +9,7 @@ #include "log.h" #include "vty.h" #include "command.h" -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "lib_errors.h" #include "checksum.h" diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c index 00d3a8530..42e407452 100644 --- a/ospf6d/ospf6_neighbor.c +++ b/ospf6d/ospf6_neighbor.c @@ -7,7 +7,7 @@ #include "log.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "command.h" diff --git a/ospf6d/ospf6_nssa.c b/ospf6d/ospf6_nssa.c index 7ff0a0932..e7a10eba4 100644 --- a/ospf6d/ospf6_nssa.c +++ b/ospf6d/ospf6_nssa.c @@ -13,7 +13,7 @@ #include "vty.h" #include "linklist.h" #include "command.h" -#include "event.h" +#include "frrevent.h" #include "plist.h" #include "filter.h" diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index 885595511..3cc0d5e96 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -13,7 +13,7 @@ #include "vty.h" #include "prefix.h" #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "lib_errors.h" #include "ospf6_lsa.h" diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index e8c7740a0..c2aa3abee 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -11,7 +11,7 @@ #include "linklist.h" #include "prefix.h" #include "table.h" -#include "event.h" +#include "frrevent.h" #include "command.h" #include "defaults.h" #include "lib/json.h" diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c index 3700511fa..214007d04 100644 --- a/ospf6d/ospf6d.c +++ b/ospf6d/ospf6d.c @@ -5,7 +5,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "command.h" diff --git a/ospf6d/ospf6d.h b/ospf6d/ospf6d.h index 89758b946..980a36526 100644 --- a/ospf6d/ospf6d.h +++ b/ospf6d/ospf6d.h @@ -7,7 +7,7 @@ #define OSPF6D_H #include "libospf.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" DECLARE_MGROUP(OSPF6D); diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c index a29c42227..a1193001f 100644 --- a/ospfclient/ospf_apiclient.c +++ b/ospfclient/ospf_apiclient.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/ospfclient/ospfclient.c b/ospfclient/ospfclient.c index 8e5a98230..24ff08561 100644 --- a/ospfclient/ospfclient.c +++ b/ospfclient/ospfclient.c @@ -43,7 +43,7 @@ struct zebra_privs_t ospfd_privs = {.user = NULL, free to use any thread library (like pthreads). */ #include "ospfd/ospf_dump.h" /* for ospf_lsa_header_dump */ -#include "event.h" +#include "frrevent.h" #include "log.h" /* Local portnumber for async channel. Note that OSPF API library will also diff --git a/ospfd/ospf_abr.c b/ospfd/ospf_abr.c index 3cb65961d..e14586c5e 100644 --- a/ospfd/ospf_abr.c +++ b/ospfd/ospf_abr.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/ospfd/ospf_api.c b/ospfd/ospf_api.c index 922696f8b..213ee8c1f 100644 --- a/ospfd/ospf_api.c +++ b/ospfd/ospf_api.c @@ -18,7 +18,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "buffer.h" diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c index 7be3c1d2a..1aacc341a 100644 --- a/ospfd/ospf_apiserver.c +++ b/ospfd/ospf_apiserver.c @@ -18,7 +18,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "buffer.h" diff --git a/ospfd/ospf_asbr.c b/ospfd/ospf_asbr.c index a7e2f7319..7befcc108 100644 --- a/ospfd/ospf_asbr.c +++ b/ospfd/ospf_asbr.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/ospfd/ospf_ase.c b/ospfd/ospf_ase.c index ea2388a3a..80390af50 100644 --- a/ospfd/ospf_ase.c +++ b/ospfd/ospf_ase.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "linklist.h" diff --git a/ospfd/ospf_bfd.c b/ospfd/ospf_bfd.c index 3146656d6..7d4c7c06b 100644 --- a/ospfd/ospf_bfd.c +++ b/ospfd/ospf_bfd.c @@ -12,7 +12,7 @@ #include "linklist.h" #include "memory.h" #include "prefix.h" -#include "event.h" +#include "frrevent.h" #include "buffer.h" #include "stream.h" #include "zclient.h" diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c index 22d67c406..dbe6dd97d 100644 --- a/ospfd/ospf_dump.c +++ b/ospfd/ospf_dump.c @@ -9,7 +9,7 @@ #include "lib/bfd.h" #include "monotime.h" #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "command.h" #include "stream.h" diff --git a/ospfd/ospf_ext.c b/ospfd/ospf_ext.c index 28f368e37..75b58035a 100644 --- a/ospfd/ospf_ext.c +++ b/ospfd/ospf_ext.c @@ -25,7 +25,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "network.h" diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c index 99bc4249f..f3fe504a0 100644 --- a/ospfd/ospf_flood.c +++ b/ospfd/ospf_flood.c @@ -12,7 +12,7 @@ #include "if.h" #include "command.h" #include "table.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "log.h" #include "zclient.h" diff --git a/ospfd/ospf_gr_helper.c b/ospfd/ospf_gr_helper.c index 33b351d82..b97b6802b 100644 --- a/ospfd/ospf_gr_helper.c +++ b/ospfd/ospf_gr_helper.c @@ -8,7 +8,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/ospfd/ospf_ia.c b/ospfd/ospf_ia.c index b4bf6cf3d..59112b2cd 100644 --- a/ospfd/ospf_ia.c +++ b/ospfd/ospf_ia.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "linklist.h" diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index 78d5bb25b..dcecffa6a 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c index 352fa83ec..9f795ea91 100644 --- a/ospfd/ospf_ism.c +++ b/ospfd/ospf_ism.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/ospfd/ospf_ldp_sync.c b/ospfd/ospf_ldp_sync.c index 0ea21e540..b97e87faa 100644 --- a/ospfd/ospf_ldp_sync.c +++ b/ospfd/ospf_ldp_sync.c @@ -9,7 +9,7 @@ #include "monotime.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "table.h" #include "vty.h" diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c index 2e206258a..850e85204 100644 --- a/ospfd/ospf_lsa.c +++ b/ospfd/ospf_lsa.c @@ -14,7 +14,7 @@ #include "memory.h" #include "stream.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "checksum.h" diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c index 6bfba6cee..1f476a7e3 100644 --- a/ospfd/ospf_main.c +++ b/ospfd/ospf_main.c @@ -9,7 +9,7 @@ #include <lib/version.h> #include "bfd.h" #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/ospfd/ospf_neighbor.c b/ospfd/ospf_neighbor.c index c490695ac..c238f051d 100644 --- a/ospfd/ospf_neighbor.c +++ b/ospfd/ospf_neighbor.c @@ -11,7 +11,7 @@ #include "prefix.h" #include "memory.h" #include "command.h" -#include "event.h" +#include "frrevent.h" #include "stream.h" #include "table.h" #include "log.h" diff --git a/ospfd/ospf_network.c b/ospfd/ospf_network.c index ba74e67a3..d3f30ce1e 100644 --- a/ospfd/ospf_network.c +++ b/ospfd/ospf_network.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c index 5eac6166a..bcbe02879 100644 --- a/ospfd/ospf_nsm.c +++ b/ospfd/ospf_nsm.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "linklist.h" diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c index ee57e975a..6f66ee10a 100644 --- a/ospfd/ospf_opaque.c +++ b/ospfd/ospf_opaque.c @@ -16,7 +16,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "printfrr.h" diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index a0cc9b0bd..5f7d49e0b 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -7,7 +7,7 @@ #include <zebra.h> #include "monotime.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c index 2503f39a3..0179f9ee0 100644 --- a/ospfd/ospf_ri.c +++ b/ospfd/ospf_ri.c @@ -20,7 +20,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "mpls.h" diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c index c6e862011..274d5bc9a 100644 --- a/ospfd/ospf_spf.c +++ b/ospfd/ospf_spf.c @@ -6,7 +6,7 @@ #include <zebra.h> #include "monotime.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "linklist.h" diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c index 8eca038a9..467cb0504 100644 --- a/ospfd/ospf_sr.c +++ b/ospfd/ospf_sr.c @@ -37,7 +37,7 @@ #include "sockunion.h" /* for inet_aton() */ #include "stream.h" #include "table.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "zclient.h" #include "sbuf.h" diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index 2c4bd17d9..dc9dd3430 100644 --- a/ospfd/ospf_te.c +++ b/ospfd/ospf_te.c @@ -24,7 +24,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "network.h" diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 024bb532a..8c0afd852 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -10,7 +10,7 @@ #include "printfrr.h" #include "monotime.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "table.h" #include "vty.h" diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index 92fb38f54..3e02d3c33 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index 2cdad9368..112ddfedb 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -5,7 +5,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "linklist.h" diff --git a/pathd/path_main.c b/pathd/path_main.c index a837187da..c333162f2 100644 --- a/pathd/path_main.c +++ b/pathd/path_main.c @@ -6,7 +6,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "command.h" #include "log.h" #include "memory.h" diff --git a/pathd/path_pcep_config.c b/pathd/path_pcep_config.c index 0e63b56f5..da7ee89f2 100644 --- a/pathd/path_pcep_config.c +++ b/pathd/path_pcep_config.c @@ -13,7 +13,7 @@ #include "pathd/path_pcep.h" #include "pathd/path_pcep_config.h" #include "pathd/path_pcep_debug.h" -#include "event.h" +#include "frrevent.h" #define MAX_XPATH 256 #define MAX_FLOAT_LEN 22 diff --git a/pathd/path_zebra.c b/pathd/path_zebra.c index 8d9206bfa..dad26383e 100644 --- a/pathd/path_zebra.c +++ b/pathd/path_zebra.c @@ -5,7 +5,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "log.h" #include "lib_errors.h" #include "if.h" diff --git a/pbrd/pbr_main.c b/pbrd/pbr_main.c index c2a9298f3..c4708d3f0 100644 --- a/pbrd/pbr_main.c +++ b/pbrd/pbr_main.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/pbrd/pbr_map.c b/pbrd/pbr_map.c index 1519af4ee..16cea3b4c 100644 --- a/pbrd/pbr_map.c +++ b/pbrd/pbr_map.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "table.h" diff --git a/pbrd/pbr_zebra.c b/pbrd/pbr_zebra.c index c2c785fb6..097c9f296 100644 --- a/pbrd/pbr_zebra.c +++ b/pbrd/pbr_zebra.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/pimd/pim6_mld.c b/pimd/pim6_mld.c index 7d3b084f3..1d84a9941 100644 --- a/pimd/pim6_mld.c +++ b/pimd/pim6_mld.c @@ -19,7 +19,7 @@ #include "lib/jhash.h" #include "lib/prefix.h" #include "lib/checksum.h" -#include "lib/event.h" +#include "lib/frrevent.h" #include "termtable.h" #include "pimd/pim6_mld.h" diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index 15c337901..bc6b84ff2 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -7,7 +7,7 @@ #include <zebra.h> #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "if.h" #include "vrf.h" diff --git a/pimd/pim_main.c b/pimd/pim_main.c index 0a782455c..7db0a7676 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -11,7 +11,7 @@ #include "lib/version.h" #include <getopt.h> #include "command.h" -#include "event.h" +#include "frrevent.h" #include <signal.h> #include "memory.h" diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c index 6c169a7e7..b1b6958fe 100644 --- a/pimd/pim_msdp.c +++ b/pimd/pim_msdp.c @@ -12,7 +12,7 @@ #include <lib/prefix.h> #include <lib/sockunion.h> #include <lib/stream.h> -#include <event.h> +#include <frrevent.h> #include <lib/vty.h> #include <lib/plist.h> #include <lib/lib_errors.h> diff --git a/pimd/pim_msdp_packet.c b/pimd/pim_msdp_packet.c index 0ec7aa77f..a414736cc 100644 --- a/pimd/pim_msdp_packet.c +++ b/pimd/pim_msdp_packet.c @@ -8,7 +8,7 @@ #include <lib/log.h> #include <lib/network.h> #include <lib/stream.h> -#include "event.h" +#include "frrevent.h" #include <lib/vty.h> #include <lib/lib_errors.h> diff --git a/pimd/pim_msdp_socket.c b/pimd/pim_msdp_socket.c index 57b313489..fe8d5e934 100644 --- a/pimd/pim_msdp_socket.c +++ b/pimd/pim_msdp_socket.c @@ -9,7 +9,7 @@ #include <lib/log.h> #include <lib/network.h> #include <lib/sockunion.h> -#include "event.h" +#include "frrevent.h" #include <lib/vty.h> #include <lib/if.h> #include <lib/vrf.h> diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c index ffd2d4283..4a272a480 100644 --- a/pimd/pim_pim.c +++ b/pimd/pim_pim.c @@ -7,7 +7,7 @@ #include <zebra.h> #include "log.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "if.h" #include "network.h" diff --git a/pimd/pim_register.c b/pimd/pim_register.c index be8b4c400..b5d9df6f2 100644 --- a/pimd/pim_register.c +++ b/pimd/pim_register.c @@ -9,7 +9,7 @@ #include "log.h" #include "if.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "vty.h" #include "plist.h" diff --git a/pimd/pim_time.c b/pimd/pim_time.c index 7b10d9114..205945e5a 100644 --- a/pimd/pim_time.c +++ b/pimd/pim_time.c @@ -11,7 +11,7 @@ #include <time.h> #include "log.h" -#include "event.h" +#include "frrevent.h" #include "lib_errors.h" #include "pim_time.h" diff --git a/pimd/pim_time.h b/pimd/pim_time.h index 47f2bc8b7..6c0e07396 100644 --- a/pimd/pim_time.h +++ b/pimd/pim_time.h @@ -10,7 +10,7 @@ #include <stdint.h> #include <zebra.h> -#include "event.h" +#include "frrevent.h" int64_t pim_time_monotonic_sec(void); int64_t pim_time_monotonic_dsec(void); diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 283fdfc19..8fa7b7cf9 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -9,7 +9,7 @@ #include "log.h" #include "zclient.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "plist.h" diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c index 0a994809b..05a72269d 100644 --- a/pimd/pim_zlookup.c +++ b/pimd/pim_zlookup.c @@ -11,7 +11,7 @@ #include "zclient.h" #include "stream.h" #include "network.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "vty.h" #include "lib_errors.h" diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index db8502550..0b92f174b 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -14,7 +14,7 @@ #include "table.h" #include "log.h" #include "stream.h" -#include "event.h" +#include "frrevent.h" #include "zclient.h" #include "filter.h" #include "sockopt.h" diff --git a/ripd/rip_main.c b/ripd/rip_main.c index fbe877ca7..a6e4ad776 100644 --- a/ripd/rip_main.c +++ b/ripd/rip_main.c @@ -7,7 +7,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "command.h" #include "memory.h" #include "prefix.h" diff --git a/ripd/rip_peer.c b/ripd/rip_peer.c index 0f5a14557..9410ef380 100644 --- a/ripd/rip_peer.c +++ b/ripd/rip_peer.c @@ -9,7 +9,7 @@ #include "prefix.h" #include "command.h" #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "ripd/ripd.h" diff --git a/ripd/ripd.c b/ripd/ripd.c index 5e07ca48f..ae4d93b4f 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -11,7 +11,7 @@ #include "command.h" #include "prefix.h" #include "table.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "log.h" #include "stream.h" diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c index 516e280b0..1d9d53e47 100644 --- a/ripngd/ripng_interface.c +++ b/ripngd/ripng_interface.c @@ -17,7 +17,7 @@ #include "zclient.h" #include "command.h" #include "agg_table.h" -#include "event.h" +#include "frrevent.h" #include "privs.h" #include "vrf.h" #include "lib_errors.h" diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c index bedd39375..1d392efdd 100644 --- a/ripngd/ripng_main.c +++ b/ripngd/ripng_main.c @@ -12,7 +12,7 @@ #include "vty.h" #include "command.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "log.h" #include "prefix.h" #include "if.h" diff --git a/ripngd/ripng_peer.c b/ripngd/ripng_peer.c index c03f2a4df..901b548a4 100644 --- a/ripngd/ripng_peer.c +++ b/ripngd/ripng_peer.c @@ -13,7 +13,7 @@ #include "prefix.h" #include "command.h" #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "ripngd/ripngd.h" diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index 18456ac48..79e8871f6 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -8,7 +8,7 @@ #include "prefix.h" #include "filter.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "if.h" #include "stream.h" diff --git a/sharpd/sharp_logpump.c b/sharpd/sharp_logpump.c index 8a8650717..5474e80b1 100644 --- a/sharpd/sharp_logpump.c +++ b/sharpd/sharp_logpump.c @@ -11,7 +11,7 @@ #include "prefix.h" #include "nexthop.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "vrf.h" #include "zclient.h" #include "frr_pthread.h" diff --git a/sharpd/sharp_main.c b/sharpd/sharp_main.c index 80979ec9a..fa85c2b44 100644 --- a/sharpd/sharp_main.c +++ b/sharpd/sharp_main.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/sharpd/sharp_zebra.c b/sharpd/sharp_zebra.c index 189d61db2..17ad70596 100644 --- a/sharpd/sharp_zebra.c +++ b/sharpd/sharp_zebra.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/staticd/static_main.c b/staticd/static_main.c index d6ef91fea..09f22318f 100644 --- a/staticd/static_main.c +++ b/staticd/static_main.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "command.h" #include "log.h" #include "memory.h" diff --git a/staticd/static_zebra.c b/staticd/static_zebra.c index 6c59f04ee..4f3ccde53 100644 --- a/staticd/static_zebra.c +++ b/staticd/static_zebra.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/tests/helpers/c/main.c b/tests/helpers/c/main.c index 5eb841448..cd2b5665e 100644 --- a/tests/helpers/c/main.c +++ b/tests/helpers/c/main.c @@ -6,7 +6,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" diff --git a/tests/isisd/test_fuzz_isis_tlv.c b/tests/isisd/test_fuzz_isis_tlv.c index 2443f3866..627ccfee6 100644 --- a/tests/isisd/test_fuzz_isis_tlv.c +++ b/tests/isisd/test_fuzz_isis_tlv.c @@ -9,7 +9,7 @@ #include "memory.h" #include "sbuf.h" #include "stream.h" -#include "event.h" +#include "frrevent.h" #include "isisd/isis_circuit.h" #include "isisd/isis_tlvs.h" diff --git a/tests/isisd/test_isis_spf.c b/tests/isisd/test_isis_spf.c index b14ef2907..85ddfea5b 100644 --- a/tests/isisd/test_isis_spf.c +++ b/tests/isisd/test_isis_spf.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "log.h" diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c index a02b2e460..e0981b991 100644 --- a/tests/lib/cli/common_cli.c +++ b/tests/lib/cli/common_cli.c @@ -8,7 +8,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" diff --git a/tests/lib/cxxcompat.c b/tests/lib/cxxcompat.c index 85dcea9e8..8f5485618 100644 --- a/tests/lib/cxxcompat.c +++ b/tests/lib/cxxcompat.c @@ -78,7 +78,7 @@ #include "lib/stream.h" #include "lib/table.h" #include "lib/termtable.h" -#include "event.h" +#include "frrevent.h" #include "lib/typesafe.h" #include "lib/typerb.h" #include "lib/vector.h" diff --git a/tests/lib/northbound/test_oper_data.c b/tests/lib/northbound/test_oper_data.c index d88b37fb4..f82eddd3b 100644 --- a/tests/lib/northbound/test_oper_data.c +++ b/tests/lib/northbound/test_oper_data.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" diff --git a/tests/lib/test_assert.c b/tests/lib/test_assert.c index 353574359..4440075b4 100644 --- a/tests/lib/test_assert.c +++ b/tests/lib/test_assert.c @@ -22,7 +22,7 @@ static void func_for_bt(int number) #include <zebra.h> #include "lib/zlog.h" -#include "event.h" +#include "frrevent.h" #include "lib/sigevent.h" int main(int argc, char **argv) diff --git a/tests/lib/test_grpc.cpp b/tests/lib/test_grpc.cpp index 65633c471..fd30f0434 100644 --- a/tests/lib/test_grpc.cpp +++ b/tests/lib/test_grpc.cpp @@ -14,7 +14,7 @@ #include "libfrr.h" #include "routing_nb.h" #include "northbound_cli.h" -#include "event.h" +#include "frrevent.h" #include "vrf.h" #include "vty.h" diff --git a/tests/lib/test_heavy.c b/tests/lib/test_heavy.c index 7bce1584e..1e5694083 100644 --- a/tests/lib/test_heavy.c +++ b/tests/lib/test_heavy.c @@ -13,7 +13,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" diff --git a/tests/lib/test_heavy_thread.c b/tests/lib/test_heavy_thread.c index 48e95a8dd..4fb9ebfa3 100644 --- a/tests/lib/test_heavy_thread.c +++ b/tests/lib/test_heavy_thread.c @@ -14,7 +14,7 @@ #include <zebra.h> #include <math.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" diff --git a/tests/lib/test_heavy_wq.c b/tests/lib/test_heavy_wq.c index f43bd77a6..225573ae9 100644 --- a/tests/lib/test_heavy_wq.c +++ b/tests/lib/test_heavy_wq.c @@ -13,7 +13,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" diff --git a/tests/lib/test_stream.c b/tests/lib/test_stream.c index 489f56c13..d38dfe0eb 100644 --- a/tests/lib/test_stream.c +++ b/tests/lib/test_stream.c @@ -6,7 +6,7 @@ #include <zebra.h> #include <stream.h> -#include "event.h" +#include "frrevent.h" #include "printfrr.h" diff --git a/tests/lib/test_timer_correctness.c b/tests/lib/test_timer_correctness.c index deaff9d48..04c051688 100644 --- a/tests/lib/test_timer_correctness.c +++ b/tests/lib/test_timer_correctness.c @@ -16,7 +16,7 @@ #include "memory.h" #include "prng.h" -#include "event.h" +#include "frrevent.h" #define SCHEDULE_TIMERS 800 #define REMOVE_TIMERS 200 diff --git a/tests/lib/test_timer_performance.c b/tests/lib/test_timer_performance.c index 2dcbb8c59..3ace076b4 100644 --- a/tests/lib/test_timer_performance.c +++ b/tests/lib/test_timer_performance.c @@ -14,7 +14,7 @@ #include <stdio.h> #include <unistd.h> -#include "event.h" +#include "frrevent.h" #include "prng.h" #define SCHEDULE_TIMERS 1000000 diff --git a/tests/ospfd/test_ospf_spf.c b/tests/ospfd/test_ospf_spf.c index 7d1d7ae26..fc6b8e89e 100644 --- a/tests/ospfd/test_ospf_spf.c +++ b/tests/ospfd/test_ospf_spf.c @@ -1,7 +1,7 @@ #include <zebra.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include <lib/version.h> #include "vty.h" #include "command.h" diff --git a/vrrpd/vrrp.h b/vrrpd/vrrp.h index fdbd35f06..0ac9b1f49 100644 --- a/vrrpd/vrrp.h +++ b/vrrpd/vrrp.h @@ -18,7 +18,7 @@ #include "lib/northbound.h" #include "lib/privs.h" #include "lib/stream.h" -#include "lib/event.h" +#include "lib/frrevent.h" #include "lib/vty.h" /* Global definitions */ diff --git a/vrrpd/vrrp_main.c b/vrrpd/vrrp_main.c index 5d4bffe03..32ee4bb13 100644 --- a/vrrpd/vrrp_main.c +++ b/vrrpd/vrrp_main.c @@ -18,7 +18,7 @@ #include "lib/nexthop.h" #include "lib/privs.h" #include "lib/sigevent.h" -#include "lib/event.h" +#include "lib/frrevent.h" #include "lib/vrf.h" #include "lib/vty.h" diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c index c6eac46ae..89199da1a 100644 --- a/watchfrr/watchfrr.c +++ b/watchfrr/watchfrr.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include <log.h> #include <network.h> #include <sigevent.h> diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c index 8fb5b28c3..3a325df06 100644 --- a/zebra/if_netlink.c +++ b/zebra/if_netlink.c @@ -33,7 +33,7 @@ #include "table.h" #include "memory.h" #include "rib.h" -#include "event.h" +#include "frrevent.h" #include "privs.h" #include "nexthop.h" #include "vrf.h" diff --git a/zebra/irdp_interface.c b/zebra/irdp_interface.c index ca46a4bf8..253e6a8dd 100644 --- a/zebra/irdp_interface.c +++ b/zebra/irdp_interface.c @@ -24,7 +24,7 @@ #include "connected.h" #include "log.h" #include "zclient.h" -#include "event.h" +#include "frrevent.h" #include "lib_errors.h" #include "zebra/interface.h" #include "zebra/rtadv.h" diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c index 19b749b56..6548790e9 100644 --- a/zebra/irdp_main.c +++ b/zebra/irdp_main.c @@ -32,7 +32,7 @@ #include "connected.h" #include "log.h" #include "zclient.h" -#include "event.h" +#include "frrevent.h" #include "privs.h" #include "libfrr.h" #include "lib_errors.h" diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c index 0ccc0af41..2dfc027f1 100644 --- a/zebra/irdp_packet.c +++ b/zebra/irdp_packet.c @@ -34,7 +34,7 @@ #include "sockunion.h" #include "sockunion.h" #include "stream.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "zclient.h" #include "lib_errors.h" diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c index 04d30577c..78b1dfe27 100644 --- a/zebra/kernel_netlink.c +++ b/zebra/kernel_netlink.c @@ -15,7 +15,7 @@ #include "table.h" #include "memory.h" #include "rib.h" -#include "event.h" +#include "frrevent.h" #include "privs.h" #include "nexthop.h" #include "vrf.h" diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index e8041dce0..b8dc92b2e 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -1255,7 +1255,7 @@ int rtm_write(int message, union sockunion *dest, union sockunion *mask, } -#include "event.h" +#include "frrevent.h" #include "zebra/zserv.h" /* For debug purpose. */ diff --git a/zebra/label_manager.h b/zebra/label_manager.h index e2f5d1901..cfbb4bd16 100644 --- a/zebra/label_manager.h +++ b/zebra/label_manager.h @@ -14,7 +14,7 @@ #include <stdint.h> #include "lib/linklist.h" -#include "event.h" +#include "frrevent.h" #include "lib/hook.h" #include "zebra/zserv.h" diff --git a/zebra/main.c b/zebra/main.c index 391633c35..ba43ae910 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" #include "command.h" -#include "event.h" +#include "frrevent.h" #include "filter.h" #include "memory.h" #include "prefix.h" diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index e92fb1915..de01ced41 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -38,7 +38,7 @@ #include "table.h" #include "memory.h" #include "rib.h" -#include "event.h" +#include "frrevent.h" #include "privs.h" #include "nexthop.h" #include "vrf.h" diff --git a/zebra/rtadv.c b/zebra/rtadv.c index f205ab01e..9af41cbc3 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -9,7 +9,7 @@ #include "memory.h" #include "sockopt.h" -#include "event.h" +#include "frrevent.h" #include "if.h" #include "stream.h" #include "log.h" diff --git a/zebra/table_manager.h b/zebra/table_manager.h index eb460c291..f8e99a357 100644 --- a/zebra/table_manager.h +++ b/zebra/table_manager.h @@ -9,7 +9,7 @@ #include <stdint.h> #include "lib/linklist.h" -#include "event.h" +#include "frrevent.h" #include "lib/ns.h" #include "zebra/zserv.h" diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c index 5b4e493e4..e379a5868 100644 --- a/zebra/zebra_fpm.c +++ b/zebra/zebra_fpm.c @@ -11,7 +11,7 @@ #include "log.h" #include "libfrr.h" #include "stream.h" -#include "event.h" +#include "frrevent.h" #include "network.h" #include "command.h" #include "lib/version.h" diff --git a/zebra/zebra_gr.c b/zebra/zebra_gr.c index 3106b82c4..96d598f7c 100644 --- a/zebra/zebra_gr.c +++ b/zebra/zebra_gr.c @@ -13,7 +13,7 @@ #include "lib/prefix.h" #include "lib/command.h" #include "lib/if.h" -#include "event.h" +#include "frrevent.h" #include "lib/stream.h" #include "lib/memory.h" #include "lib/table.h" diff --git a/zebra/zebra_mlag_private.c b/zebra/zebra_mlag_private.c index d85097f2a..f348c5075 100644 --- a/zebra/zebra_mlag_private.c +++ b/zebra/zebra_mlag_private.c @@ -12,7 +12,7 @@ #include "hook.h" #include "module.h" -#include "event.h" +#include "frrevent.h" #include "frr_pthread.h" #include "libfrr.h" #include "lib/version.h" diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c index dfb4875ff..3fbf20108 100644 --- a/zebra/zebra_mpls.c +++ b/zebra/zebra_mpls.c @@ -13,7 +13,7 @@ #include "log.h" #include "sockunion.h" #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "workqueue.h" #include "prefix.h" #include "routemap.h" diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c index 5ccff635f..4260d29c4 100644 --- a/zebra/zebra_netns_notify.c +++ b/zebra/zebra_netns_notify.c @@ -17,7 +17,7 @@ #include <sys/inotify.h> #include <sys/stat.h> -#include "event.h" +#include "frrevent.h" #include "ns.h" #include "command.h" #include "memory.h" diff --git a/zebra/zebra_pw.c b/zebra/zebra_pw.c index d5f56d417..a02d7e880 100644 --- a/zebra/zebra_pw.c +++ b/zebra/zebra_pw.c @@ -7,7 +7,7 @@ #include "log.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "command.h" #include "vrf.h" #include "lib/json.h" diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 014b5126b..5a86b7d0a 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -18,7 +18,7 @@ #include "sockunion.h" #include "srcdest_table.h" #include "table.h" -#include "event.h" +#include "frrevent.h" #include "vrf.h" #include "workqueue.h" #include "nexthop_group_private.h" diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c index 61a4559e0..abb10e21c 100644 --- a/zebra/zebra_rnh.c +++ b/zebra/zebra_rnh.c @@ -13,7 +13,7 @@ #include "log.h" #include "sockunion.h" #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "workqueue.h" #include "prefix.h" #include "routemap.h" diff --git a/zebra/zserv.c b/zebra/zserv.c index 87cce37ba..70707866e 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -34,7 +34,7 @@ #include "lib/sockopt.h" /* for setsockopt_so_recvbuf, setsockopt... */ #include "lib/sockunion.h" /* for sockopt_reuseaddr, sockopt_reuseport */ #include "lib/stream.h" /* for STREAM_SIZE, stream (ptr only), ... */ -#include "event.h" /* for thread (ptr only), EVENT_ARG, ... */ +#include "frrevent.h" /* for thread (ptr only), EVENT_ARG, ... */ #include "lib/vrf.h" /* for vrf_info_lookup, VRF_DEFAULT */ #include "lib/vty.h" /* for vty_out, vty (ptr only) */ #include "lib/zclient.h" /* for zmsghdr, ZEBRA_HEADER_SIZE, ZEBRA... */ diff --git a/zebra/zserv.h b/zebra/zserv.h index fc1fd0ec9..aa58a3a29 100644 --- a/zebra/zserv.h +++ b/zebra/zserv.h @@ -19,7 +19,7 @@ #include "lib/vrf.h" /* for vrf_bitmap_t */ #include "lib/zclient.h" /* for redist_proto */ #include "lib/stream.h" /* for stream, stream_fifo */ -#include "event.h" /* for thread, thread_master */ +#include "frrevent.h" /* for thread, thread_master */ #include "lib/linklist.h" /* for list */ #include "lib/workqueue.h" /* for work_queue */ #include "lib/hook.h" /* for DECLARE_HOOK, DECLARE_KOOH */ |