diff options
Diffstat (limited to 'ldpd/packet.c')
| -rw-r--r-- | ldpd/packet.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/ldpd/packet.c b/ldpd/packet.c index a253ef4660..71eeb1adb6 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); + int fd = EVENT_FD(thread); + struct event **threadp = EVENT_ARG(thread); union { struct cmsghdr hdr; @@ -129,7 +129,7 @@ void disc_recv_packet(struct thread *thread) struct in_addr lsr_id; /* reschedule read */ - thread_add_read(master, disc_recv_packet, threadp, fd, threadp); + event_add_read(master, disc_recv_packet, threadp, fd, threadp); /* setup buffer */ memset(&m, 0, sizeof(m)); @@ -290,9 +290,9 @@ 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); + int fd = EVENT_FD(thread); struct sockaddr_storage src; socklen_t len = sizeof(src); int newfd; @@ -394,10 +394,10 @@ 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); + int fd = EVENT_FD(thread); + struct nbr *nbr = EVENT_ARG(thread); struct tcp_conn *tcp = nbr->tcp; struct ldp_hdr *ldp_hdr; struct ldp_msg *msg; @@ -406,7 +406,7 @@ static void session_read(struct thread *thread) uint16_t pdu_len, msg_len, msg_size, max_pdu_len; int ret; - thread_add_read(master, session_read, nbr, fd, &tcp->rev); + event_add_read(master, session_read, nbr, fd, &tcp->rev); if ((n = read(fd, tcp->rbuf->buf + tcp->rbuf->wpos, sizeof(tcp->rbuf->buf) - tcp->rbuf->wpos)) == -1) { @@ -610,9 +610,9 @@ 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 tcp_conn *tcp = EVENT_ARG(thread); struct nbr *nbr = tcp->nbr; tcp->wbuf.ev = NULL; @@ -640,7 +640,7 @@ session_shutdown(struct nbr *nbr, uint32_t status, uint32_t msg_id, switch (nbr->state) { case NBR_STA_PRESENT: if (nbr_pending_connect(nbr)) - THREAD_OFF(nbr->ev_connect); + EVENT_OFF(nbr->ev_connect); break; case NBR_STA_INITIAL: case NBR_STA_OPENREC: @@ -721,7 +721,7 @@ tcp_new(int fd, struct nbr *nbr) if ((tcp->rbuf = calloc(1, sizeof(struct ibuf_read))) == NULL) fatal(__func__); - thread_add_read(master, session_read, nbr, tcp->fd, &tcp->rev); + event_add_read(master, session_read, nbr, tcp->fd, &tcp->rev); tcp->nbr = nbr; } @@ -745,7 +745,7 @@ tcp_close(struct tcp_conn *tcp) evbuf_clear(&tcp->wbuf); if (tcp->nbr) { - THREAD_OFF(tcp->rev); + EVENT_OFF(tcp->rev); free(tcp->rbuf); tcp->nbr->tcp = NULL; } @@ -768,8 +768,8 @@ pending_conn_new(int fd, int af, union ldpd_addr *addr) pconn->addr = *addr; TAILQ_INSERT_TAIL(&global.pending_conns, pconn, entry); pconn->ev_timeout = NULL; - thread_add_timer(master, pending_conn_timeout, pconn, PENDING_CONN_TIMEOUT, - &pconn->ev_timeout); + event_add_timer(master, pending_conn_timeout, pconn, + PENDING_CONN_TIMEOUT, &pconn->ev_timeout); return (pconn); } @@ -777,7 +777,7 @@ pending_conn_new(int fd, int af, union ldpd_addr *addr) void pending_conn_del(struct pending_conn *pconn) { - THREAD_OFF(pconn->ev_timeout); + EVENT_OFF(pconn->ev_timeout); TAILQ_REMOVE(&global.pending_conns, pconn, entry); free(pconn); } @@ -795,9 +795,9 @@ 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 pending_conn *pconn = EVENT_ARG(thread); struct tcp_conn *tcp; pconn->ev_timeout = NULL; |