diff options
Diffstat (limited to 'ldpd')
| -rw-r--r-- | ldpd/accept.c | 16 | ||||
| -rw-r--r-- | ldpd/adjacency.c | 8 | ||||
| -rw-r--r-- | ldpd/control.c | 8 | ||||
| -rw-r--r-- | ldpd/interface.c | 8 | ||||
| -rw-r--r-- | ldpd/lde.c | 12 | ||||
| -rw-r--r-- | ldpd/lde.h | 4 | ||||
| -rw-r--r-- | ldpd/lde_lib.c | 4 | ||||
| -rw-r--r-- | ldpd/ldpd.c | 14 | ||||
| -rw-r--r-- | ldpd/ldpd.h | 26 | ||||
| -rw-r--r-- | ldpd/ldpe.c | 16 | ||||
| -rw-r--r-- | ldpd/ldpe.h | 22 | ||||
| -rw-r--r-- | ldpd/neighbor.c | 18 | ||||
| -rw-r--r-- | ldpd/packet.c | 18 | 
13 files changed, 87 insertions, 87 deletions
diff --git a/ldpd/accept.c b/ldpd/accept.c index 170c079b52..6151c1a0b6 100644 --- a/ldpd/accept.c +++ b/ldpd/accept.c @@ -13,21 +13,21 @@  struct accept_ev {  	LIST_ENTRY(accept_ev)	 entry; -	struct thread		*ev; -	void (*accept_cb)(struct thread *); +	struct event *ev; +	void (*accept_cb)(struct event *);  	void			*arg;  	int			 fd;  };  struct {  	LIST_HEAD(, accept_ev)	 queue; -	struct thread		*evt; +	struct event *evt;  } accept_queue;  static void	accept_arm(void);  static void	accept_unarm(void); -static void accept_cb(struct thread *); -static void accept_timeout(struct thread *); +static void accept_cb(struct event *); +static void accept_timeout(struct event *);  void  accept_init(void) @@ -35,7 +35,7 @@ accept_init(void)  	LIST_INIT(&accept_queue.queue);  } -int accept_add(int fd, void (*cb)(struct thread *), void *arg) +int accept_add(int fd, void (*cb)(struct event *), void *arg)  {  	struct accept_ev	*av; @@ -103,14 +103,14 @@ accept_unarm(void)  		THREAD_OFF(av->ev);  } -static void accept_cb(struct thread *thread) +static void accept_cb(struct event *thread)  {  	struct accept_ev	*av = THREAD_ARG(thread);  	thread_add_read(master, accept_cb, av, av->fd, &av->ev);  	av->accept_cb(thread);  } -static void accept_timeout(struct thread *thread) +static void accept_timeout(struct event *thread)  {  	accept_queue.evt = NULL; diff --git a/ldpd/adjacency.c b/ldpd/adjacency.c index 42c3ef0535..36c14a5622 100644 --- a/ldpd/adjacency.c +++ b/ldpd/adjacency.c @@ -15,12 +15,12 @@  #include "log.h"  static __inline int adj_compare(const struct adj *, const struct adj *); -static void adj_itimer(struct thread *); +static void adj_itimer(struct event *);  static __inline int tnbr_compare(const struct tnbr *, const struct tnbr *);  static void	 tnbr_del(struct ldpd_conf *, struct tnbr *);  static void	 tnbr_start(struct tnbr *);  static void	 tnbr_stop(struct tnbr *); -static void tnbr_hello_timer(struct thread *); +static void tnbr_hello_timer(struct event *);  static void	 tnbr_start_hello_timer(struct tnbr *);  static void	 tnbr_stop_hello_timer(struct tnbr *); @@ -161,7 +161,7 @@ adj_get_af(const struct adj *adj)  /* adjacency timers */  /* ARGSUSED */ -static void adj_itimer(struct thread *thread) +static void adj_itimer(struct event *thread)  {  	struct adj *adj = THREAD_ARG(thread); @@ -331,7 +331,7 @@ tnbr_get_hello_interval(struct tnbr *tnbr)  /* target neighbors timers */  /* ARGSUSED */ -static void tnbr_hello_timer(struct thread *thread) +static void tnbr_hello_timer(struct event *thread)  {  	struct tnbr	*tnbr = THREAD_ARG(thread); diff --git a/ldpd/control.c b/ldpd/control.c index b1260feb68..2313e232fe 100644 --- a/ldpd/control.c +++ b/ldpd/control.c @@ -15,11 +15,11 @@  #define	CONTROL_BACKLOG	5 -static void control_accept(struct thread *); +static void control_accept(struct event *);  static struct ctl_conn	*control_connbyfd(int);  static struct ctl_conn	*control_connbypid(pid_t);  static void		 control_close(int); -static void control_dispatch_imsg(struct thread *); +static void control_dispatch_imsg(struct event *);  struct ctl_conns	 ctl_conns; @@ -90,7 +90,7 @@ control_cleanup(char *path)  }  /* ARGSUSED */ -static void control_accept(struct thread *thread) +static void control_accept(struct event *thread)  {  	int			 connfd;  	socklen_t		 len; @@ -177,7 +177,7 @@ control_close(int fd)  }  /* ARGSUSED */ -static void control_dispatch_imsg(struct thread *thread) +static void control_dispatch_imsg(struct event *thread)  {  	int		 fd = THREAD_FD(thread);  	struct ctl_conn	*c; diff --git a/ldpd/interface.c b/ldpd/interface.c index 5d1859298e..6996bf7c10 100644 --- a/ldpd/interface.c +++ b/ldpd/interface.c @@ -22,7 +22,7 @@ static struct if_addr	*if_addr_lookup(struct if_addr_head *, struct kaddr *);  static int		 if_start(struct iface *, int);  static int		 if_reset(struct iface *, int);  static void		 if_update_af(struct iface_af *); -static void if_hello_timer(struct thread *thread); +static void if_hello_timer(struct event *thread);  static void		 if_start_hello_timer(struct iface_af *);  static void		 if_stop_hello_timer(struct iface_af *);  static int		 if_join_ipv4_group(struct iface *, struct in_addr *); @@ -32,7 +32,7 @@ static int		 if_leave_ipv6_group(struct iface *, struct in6_addr *);  static int ldp_sync_fsm_init(struct iface *iface, int state);  static int ldp_sync_act_iface_start_sync(struct iface *iface); -static void iface_wait_for_ldp_sync_timer(struct thread *thread); +static void iface_wait_for_ldp_sync_timer(struct event *thread);  static void start_wait_for_ldp_sync_timer(struct iface *iface);  static void stop_wait_for_ldp_sync_timer(struct iface *iface);  static int ldp_sync_act_ldp_start_sync(struct iface *iface); @@ -444,7 +444,7 @@ if_get_wait_for_sync_interval(void)  /* timers */  /* ARGSUSED */ -static void if_hello_timer(struct thread *thread) +static void if_hello_timer(struct event *thread)  {  	struct iface_af		*ia = THREAD_ARG(thread); @@ -720,7 +720,7 @@ ldp_sync_act_iface_start_sync(struct iface *iface)  	return (0);  } -static void iface_wait_for_ldp_sync_timer(struct thread *thread) +static void iface_wait_for_ldp_sync_timer(struct event *thread)  {  	struct iface *iface = THREAD_ARG(thread); diff --git a/ldpd/lde.c b/ldpd/lde.c index 325b33d057..3a38e165cc 100644 --- a/ldpd/lde.c +++ b/ldpd/lde.c @@ -30,8 +30,8 @@  #include "libfrr.h"  static void		 lde_shutdown(void); -static void lde_dispatch_imsg(struct thread *thread); -static void lde_dispatch_parent(struct thread *thread); +static void lde_dispatch_imsg(struct event *thread); +static void lde_dispatch_parent(struct event *thread);  static __inline	int	 lde_nbr_compare(const struct lde_nbr *,  			    const struct lde_nbr *);  static struct lde_nbr	*lde_nbr_new(uint32_t, struct lde_nbr *); @@ -145,7 +145,7 @@ lde(void)  	/* create base configuration */  	ldeconf = config_new_empty(); -	struct thread thread; +	struct event thread;  	while (thread_fetch(master, &thread))  		thread_call(&thread); @@ -232,7 +232,7 @@ lde_imsg_compose_ldpe(int type, uint32_t peerid, pid_t pid, void *data,  }  /* ARGSUSED */ -static void lde_dispatch_imsg(struct thread *thread) +static void lde_dispatch_imsg(struct event *thread)  {  	struct imsgev		*iev = THREAD_ARG(thread);  	struct imsgbuf		*ibuf = &iev->ibuf; @@ -402,7 +402,7 @@ static void lde_dispatch_imsg(struct thread *thread)  }  /* ARGSUSED */ -static void lde_dispatch_parent(struct thread *thread) +static void lde_dispatch_parent(struct event *thread)  {  	static struct ldpd_conf	*nconf;  	struct iface		*iface, *niface; @@ -2123,7 +2123,7 @@ lde_address_list_free(struct lde_nbr *ln)  /*   * Event callback used to retry the label-manager sync zapi session.   */ -static void zclient_sync_retry(struct thread *thread) +static void zclient_sync_retry(struct event *thread)  {  	zclient_sync_init();  } diff --git a/ldpd/lde.h b/ldpd/lde.h index 3a64f0d3b9..2688b6a86b 100644 --- a/ldpd/lde.h +++ b/ldpd/lde.h @@ -132,7 +132,7 @@ struct label_chunk {  extern struct ldpd_conf	*ldeconf;  extern struct fec_tree	 ft;  extern struct nbr_tree	 lde_nbrs; -extern struct thread	*gc_timer; +extern struct event *gc_timer;  /* lde.c */  void		 lde(void); @@ -216,7 +216,7 @@ void		 lde_check_withdraw(struct map *, struct lde_nbr *);  void		 lde_check_withdraw_wcard(struct map *, struct lde_nbr *);  int		 lde_wildcard_apply(struct map *, struct fec *,  		    struct lde_map *); -void lde_gc_timer(struct thread *thread); +void lde_gc_timer(struct event *thread);  void		 lde_gc_start_timer(void);  void		 lde_gc_stop_timer(void); diff --git a/ldpd/lde_lib.c b/ldpd/lde_lib.c index d737e9f416..62d06dfb19 100644 --- a/ldpd/lde_lib.c +++ b/ldpd/lde_lib.c @@ -28,7 +28,7 @@ static void		 fec_nh_del(struct fec_nh *);  RB_GENERATE(fec_tree, fec, entry, fec_compare)  struct fec_tree		 ft = RB_INITIALIZER(&ft); -struct thread		*gc_timer; +struct event *gc_timer;  /* FEC tree functions */  void @@ -1026,7 +1026,7 @@ lde_wildcard_apply(struct map *wcard, struct fec *fec, struct lde_map *me)  /* gabage collector timer: timer to remove dead entries from the LIB */  /* ARGSUSED */ -void lde_gc_timer(struct thread *thread) +void lde_gc_timer(struct event *thread)  {  	struct fec	*fec, *safe;  	struct fec_node	*fn; diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index 2026a7857c..f549b34ee2 100644 --- a/ldpd/ldpd.c +++ b/ldpd/ldpd.c @@ -35,8 +35,8 @@  static void		 ldpd_shutdown(void);  static pid_t		 start_child(enum ldpd_process, char *, int, int); -static void main_dispatch_ldpe(struct thread *thread); -static void main_dispatch_lde(struct thread *thread); +static void main_dispatch_ldpe(struct event *thread); +static void main_dispatch_lde(struct event *thread);  static int		 main_imsg_send_ipc_sockets(struct imsgbuf *,  			    struct imsgbuf *);  static void		 main_imsg_send_net_sockets(int); @@ -208,7 +208,7 @@ FRR_DAEMON_INFO(ldpd, LDP,  	.n_yang_modules = array_size(ldpd_yang_modules),  ); -static void ldp_config_fork_apply(struct thread *t) +static void ldp_config_fork_apply(struct event *t)  {  	/*  	 * So the frr_config_fork() function schedules @@ -557,7 +557,7 @@ start_child(enum ldpd_process p, char *argv0, int fd_async, int fd_sync)  /* imsg handling */  /* ARGSUSED */ -static void main_dispatch_ldpe(struct thread *thread) +static void main_dispatch_ldpe(struct event *thread)  {  	struct imsgev		*iev = THREAD_ARG(thread);  	struct imsgbuf		*ibuf = &iev->ibuf; @@ -625,7 +625,7 @@ static void main_dispatch_ldpe(struct thread *thread)  }  /* ARGSUSED */ -static void main_dispatch_lde(struct thread *thread) +static void main_dispatch_lde(struct event *thread)  {  	struct imsgev	*iev = THREAD_ARG(thread);  	struct imsgbuf	*ibuf = &iev->ibuf; @@ -733,7 +733,7 @@ static void main_dispatch_lde(struct thread *thread)  }  /* ARGSUSED */ -void ldp_write_handler(struct thread *thread) +void ldp_write_handler(struct event *thread)  {  	struct imsgev	*iev = THREAD_ARG(thread);  	struct imsgbuf	*ibuf = &iev->ibuf; @@ -823,7 +823,7 @@ evbuf_event_add(struct evbuf *eb)  				 &eb->ev);  } -void evbuf_init(struct evbuf *eb, int fd, void (*handler)(struct thread *), +void evbuf_init(struct evbuf *eb, int fd, void (*handler)(struct event *),  		void *arg)  {  	msgbuf_init(&eb->wbuf); diff --git a/ldpd/ldpd.h b/ldpd/ldpd.h index cbf9165538..4f20989c05 100644 --- a/ldpd/ldpd.h +++ b/ldpd/ldpd.h @@ -51,17 +51,17 @@  struct evbuf {  	struct msgbuf		 wbuf; -	struct thread		*ev; -	void (*handler)(struct thread *); +	struct event *ev; +	void (*handler)(struct event *);  	void			*arg;  };  struct imsgev {  	struct imsgbuf		 ibuf; -	void (*handler_write)(struct thread *); -	struct thread		*ev_write; -	void (*handler_read)(struct thread *); -	struct thread		*ev_read; +	void (*handler_write)(struct event *); +	struct event *ev_write; +	void (*handler_read)(struct event *); +	struct event *ev_read;  };  enum imsg_type { @@ -329,14 +329,14 @@ struct iface_af {  	int			 state;  	struct ia_adj_head	 adj_tree;  	time_t			 uptime; -	struct thread		*hello_timer; +	struct event *hello_timer;  	uint16_t		 hello_holdtime;  	uint16_t		 hello_interval;  };  struct iface_ldp_sync {  	int			 state; -	struct thread           *wait_for_sync_timer; +	struct event *wait_for_sync_timer;  };  struct iface { @@ -359,7 +359,7 @@ DECLARE_QOBJ_TYPE(iface);  /* source of targeted hellos */  struct tnbr {  	RB_ENTRY(tnbr)		 entry; -	struct thread		*hello_timer; +	struct event *hello_timer;  	struct adj		*adj;  	int			 af;  	union ldpd_addr		 addr; @@ -582,8 +582,8 @@ DECLARE_QOBJ_TYPE(ldpd_conf);  #define	F_LDPD_ALLOW_BROKEN_LSP 0x0010  struct ldpd_af_global { -	struct thread		*disc_ev; -	struct thread		*edisc_ev; +	struct event *disc_ev; +	struct event *edisc_ev;  	int			 ldp_disc_socket;  	int			 ldp_edisc_socket;  	int			 ldp_session_socket; @@ -781,7 +781,7 @@ void		 sa2addr(struct sockaddr *, int *, union ldpd_addr *,  socklen_t	 sockaddr_len(struct sockaddr *);  /* ldpd.c */ -void ldp_write_handler(struct thread *thread); +void ldp_write_handler(struct event *thread);  void			 main_imsg_compose_ldpe(int, pid_t, void *, uint16_t);  void			 main_imsg_compose_lde(int, pid_t, void *, uint16_t);  int			 main_imsg_compose_both(enum imsg_type, void *, @@ -791,7 +791,7 @@ int			 imsg_compose_event(struct imsgev *, uint16_t, uint32_t,  			    pid_t, int, void *, uint16_t);  void			 evbuf_enqueue(struct evbuf *, struct ibuf *);  void			 evbuf_event_add(struct evbuf *); -void evbuf_init(struct evbuf *, int, void (*)(struct thread *), void *); +void evbuf_init(struct evbuf *, int, void (*)(struct event *), void *);  void			 evbuf_clear(struct evbuf *);  int			 ldp_acl_request(struct imsgev *, char *, int,  			    union ldpd_addr *, uint8_t); diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c index f53dc72540..61a1a2aa81 100644 --- a/ldpd/ldpe.c +++ b/ldpd/ldpe.c @@ -25,10 +25,10 @@  #include "libfrr.h"  static void	 ldpe_shutdown(void); -static void ldpe_dispatch_main(struct thread *thread); -static void ldpe_dispatch_lde(struct thread *thread); +static void ldpe_dispatch_main(struct event *thread); +static void ldpe_dispatch_lde(struct event *thread);  #ifdef __OpenBSD__ -static void ldpe_dispatch_pfkey(struct thread *thread); +static void ldpe_dispatch_pfkey(struct event *thread);  #endif  static void	 ldpe_setup_sockets(int, int, int, int);  static void	 ldpe_close_sockets(int); @@ -44,7 +44,7 @@ static struct imsgev    iev_main_data;  static struct imsgev	*iev_main, *iev_main_sync;  static struct imsgev	*iev_lde;  #ifdef __OpenBSD__ -static struct thread	*pfkey_ev; +static struct event *pfkey_ev;  #endif  /* ldpe privileges */ @@ -122,7 +122,7 @@ ldpe(void)  	/* create base configuration */  	leconf = config_new_empty(); -	struct thread thread; +	struct event thread;  	while (thread_fetch(master, &thread))  		thread_call(&thread); @@ -262,7 +262,7 @@ ldpe_imsg_compose_lde(int type, uint32_t peerid, pid_t pid, void *data,  }  /* ARGSUSED */ -static void ldpe_dispatch_main(struct thread *thread) +static void ldpe_dispatch_main(struct event *thread)  {  	static struct ldpd_conf	*nconf;  	struct iface		*niface; @@ -622,7 +622,7 @@ static void ldpe_dispatch_main(struct thread *thread)  }  /* ARGSUSED */ -static void ldpe_dispatch_lde(struct thread *thread) +static void ldpe_dispatch_lde(struct event *thread)  {  	struct imsgev		*iev = THREAD_ARG(thread);  	struct imsgbuf		*ibuf = &iev->ibuf; @@ -759,7 +759,7 @@ static void ldpe_dispatch_lde(struct thread *thread)  #ifdef __OpenBSD__  /* ARGSUSED */ -static void ldpe_dispatch_pfkey(struct thread *thread) +static void ldpe_dispatch_pfkey(struct event *thread)  {  	int	 fd = THREAD_FD(thread); diff --git a/ldpd/ldpe.h b/ldpd/ldpe.h index e799538b62..f310ba5dd2 100644 --- a/ldpd/ldpe.h +++ b/ldpd/ldpe.h @@ -37,7 +37,7 @@ struct adj {  	struct nbr		*nbr;  	int			 ds_tlv;  	struct hello_source	 source; -	struct thread		*inactivity_timer; +	struct event *inactivity_timer;  	uint16_t		 holdtime;  	union ldpd_addr		 trans_addr;  }; @@ -50,7 +50,7 @@ struct tcp_conn {  	int			 fd;  	struct ibuf_read	*rbuf;  	struct evbuf		 wbuf; -	struct thread		*rev; +	struct event *rev;  	in_port_t		 lport;  	in_port_t		 rport;  }; @@ -59,11 +59,11 @@ struct nbr {  	RB_ENTRY(nbr)		 id_tree, addr_tree, pid_tree;  	struct tcp_conn		*tcp;  	struct nbr_adj_head	 adj_tree;	/* adjacencies */ -	struct thread		*ev_connect; -	struct thread		*keepalive_timer; -	struct thread		*keepalive_timeout; -	struct thread		*init_timeout; -	struct thread		*initdelay_timer; +	struct event *ev_connect; +	struct event *keepalive_timer; +	struct event *keepalive_timeout; +	struct event *init_timeout; +	struct event *initdelay_timer;  	struct mapping_head	 mapping_list;  	struct mapping_head	 withdraw_list; @@ -115,7 +115,7 @@ struct pending_conn {  	int				 fd;  	int				 af;  	union ldpd_addr			 addr; -	struct thread			*ev_timeout; +	struct event *ev_timeout;  };  #define PENDING_CONN_TIMEOUT	5 @@ -137,7 +137,7 @@ extern struct nbr_pid_head	 nbrs_by_pid;  /* accept.c */  void	accept_init(void); -int accept_add(int, void (*)(struct thread *), void *); +int accept_add(int, void (*)(struct event *), void *);  void	accept_del(int);  void	accept_pause(void);  void	accept_unpause(void); @@ -281,8 +281,8 @@ int			 gen_ldp_hdr(struct ibuf *, uint16_t);  int			 gen_msg_hdr(struct ibuf *, uint16_t, uint16_t);  int			 send_packet(int, int, union ldpd_addr *,  			    struct iface_af *, void *, size_t); -void disc_recv_packet(struct thread *thread); -void session_accept(struct thread *thread); +void disc_recv_packet(struct event *thread); +void session_accept(struct event *thread);  void			 session_accept_nbr(struct nbr *, int);  void			 session_shutdown(struct nbr *, uint32_t, uint32_t,  			    uint32_t); diff --git a/ldpd/neighbor.c b/ldpd/neighbor.c index 831f2a6aba..e1c9e63375 100644 --- a/ldpd/neighbor.c +++ b/ldpd/neighbor.c @@ -24,13 +24,13 @@ static __inline int	 nbr_addr_compare(const struct nbr *,  static __inline int	 nbr_pid_compare(const struct nbr *,  			    const struct nbr *);  static void		 nbr_update_peerid(struct nbr *); -static void nbr_ktimer(struct thread *thread); +static void nbr_ktimer(struct event *thread);  static void		 nbr_start_ktimer(struct nbr *); -static void nbr_ktimeout(struct thread *thread); +static void nbr_ktimeout(struct event *thread);  static void		 nbr_start_ktimeout(struct nbr *); -static void nbr_itimeout(struct thread *thread); +static void nbr_itimeout(struct event *thread);  static void		 nbr_start_itimeout(struct nbr *); -static void nbr_idtimer(struct thread *thread); +static void nbr_idtimer(struct event *thread);  static int		 nbr_act_session_operational(struct nbr *);  static void		 nbr_send_labelmappings(struct nbr *);  static __inline int	 nbr_params_compare(const struct nbr_params *, @@ -407,7 +407,7 @@ nbr_session_active_role(struct nbr *nbr)  /* Keepalive timer: timer to send keepalive message to neighbors */ -static void nbr_ktimer(struct thread *thread) +static void nbr_ktimer(struct event *thread)  {  	struct nbr	*nbr = THREAD_ARG(thread); @@ -436,7 +436,7 @@ nbr_stop_ktimer(struct nbr *nbr)  /* Keepalive timeout: if the nbr hasn't sent keepalive */ -static void nbr_ktimeout(struct thread *thread) +static void nbr_ktimeout(struct event *thread)  {  	struct nbr *nbr = THREAD_ARG(thread); @@ -464,7 +464,7 @@ nbr_stop_ktimeout(struct nbr *nbr)  /* Session initialization timeout: if nbr got stuck in the initialization FSM */ -static void nbr_itimeout(struct thread *thread) +static void nbr_itimeout(struct event *thread)  {  	struct nbr	*nbr = THREAD_ARG(thread); @@ -492,7 +492,7 @@ nbr_stop_itimeout(struct nbr *nbr)  /* Init delay timer: timer to retry to iniziatize session */ -static void nbr_idtimer(struct thread *thread) +static void nbr_idtimer(struct event *thread)  {  	struct nbr *nbr = THREAD_ARG(thread); @@ -549,7 +549,7 @@ nbr_pending_connect(struct nbr *nbr)  	return (nbr->ev_connect != NULL);  } -static void nbr_connect_cb(struct thread *thread) +static void nbr_connect_cb(struct event *thread)  {  	struct nbr	*nbr = THREAD_ARG(thread);  	int		 error; diff --git a/ldpd/packet.c b/ldpd/packet.c index a253ef4660..6770ab73ef 100644 --- a/ldpd/packet.c +++ b/ldpd/packet.c @@ -17,12 +17,12 @@  static struct iface		*disc_find_iface(unsigned int, int,  				    union ldpd_addr *); -static void session_read(struct thread *thread); -static void session_write(struct thread *thread); +static void session_read(struct event *thread); +static void session_write(struct event *thread);  static ssize_t			 session_get_pdu(struct ibuf_read *, char **);  static void			 tcp_close(struct tcp_conn *);  static struct pending_conn	*pending_conn_new(int, int, union ldpd_addr *); -static void pending_conn_timeout(struct thread *thread); +static void pending_conn_timeout(struct event *thread);  int  gen_ldp_hdr(struct ibuf *buf, uint16_t size) @@ -95,10 +95,10 @@ send_packet(int fd, int af, union ldpd_addr *dst, struct iface_af *ia,  }  /* Discovery functions */ -void disc_recv_packet(struct thread *thread) +void disc_recv_packet(struct event *thread)  {  	int			 fd = THREAD_FD(thread); -	struct thread		**threadp = THREAD_ARG(thread); +	struct event **threadp = THREAD_ARG(thread);  	union {  		struct	cmsghdr hdr; @@ -290,7 +290,7 @@ disc_find_iface(unsigned int ifindex, int af, union ldpd_addr *src)  	return (iface);  } -void session_accept(struct thread *thread) +void session_accept(struct event *thread)  {  	int			 fd = THREAD_FD(thread);  	struct sockaddr_storage	 src; @@ -394,7 +394,7 @@ session_accept_nbr(struct nbr *nbr, int fd)  	nbr_fsm(nbr, NBR_EVT_MATCH_ADJ);  } -static void session_read(struct thread *thread) +static void session_read(struct event *thread)  {  	int		 fd = THREAD_FD(thread);  	struct nbr	*nbr = THREAD_ARG(thread); @@ -610,7 +610,7 @@ static void session_read(struct thread *thread)  	free(buf);  } -static void session_write(struct thread *thread) +static void session_write(struct event *thread)  {  	struct tcp_conn *tcp = THREAD_ARG(thread);  	struct nbr	*nbr = tcp->nbr; @@ -795,7 +795,7 @@ pending_conn_find(int af, union ldpd_addr *addr)  	return (NULL);  } -static void pending_conn_timeout(struct thread *thread) +static void pending_conn_timeout(struct event *thread)  {  	struct pending_conn	*pconn = THREAD_ARG(thread);  	struct tcp_conn		*tcp;  | 
