From 16c012e1e1901d376e0f096d536b7bc9515ea884 Mon Sep 17 00:00:00 2001 From: Pat Ruddy Date: Wed, 3 Mar 2021 11:17:38 +0000 Subject: [PATCH] ospf6d: create an ospf_read_helper function Take the contents of ospf6_receive and split the funtionality that deals with a single packet receipt and place it in a separate helper function. This is the first step in a refactor process to allow the ospf6_read task to read until failure. Signed-off-by: Pat Ruddy --- ospf6d/ospf6_message.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c index f83be7b49c..f3555499c9 100644 --- a/ospf6d/ospf6_message.c +++ b/ospf6d/ospf6_message.c @@ -1570,23 +1570,14 @@ void ospf6_message_terminate(void) iobuflen = 0; } -int ospf6_receive(struct thread *thread) +static int ospf6_read_helper(int sockfd, struct ospf6 *ospf6) { - int sockfd; unsigned int len; struct in6_addr src, dst; ifindex_t ifindex; struct iovec iovector[2]; struct ospf6_interface *oi; struct ospf6_header *oh; - struct ospf6 *ospf6; - - /* add next read thread */ - ospf6 = THREAD_ARG(thread); - sockfd = THREAD_FD(thread); - - thread_add_read(master, ospf6_receive, ospf6, ospf6->fd, - &ospf6->t_ospf6_receive); /* initialize */ memset(&src, 0, sizeof(src)); @@ -1687,6 +1678,21 @@ int ospf6_receive(struct thread *thread) return 0; } +int ospf6_receive(struct thread *thread) +{ + int sockfd; + struct ospf6 *ospf6; + + /* add next read thread */ + ospf6 = THREAD_ARG(thread); + sockfd = THREAD_FD(thread); + + thread_add_read(master, ospf6_receive, ospf6, ospf6->fd, + &ospf6->t_ospf6_receive); + + return ospf6_read_helper(sockfd, ospf6); +} + static void ospf6_send(struct in6_addr *src, struct in6_addr *dst, struct ospf6_interface *oi, struct ospf6_header *oh) { -- 2.39.5