summaryrefslogtreecommitdiff
path: root/src/ipcpd/normal/fa.c
diff options
context:
space:
mode:
authordimitri staessens <[email protected]>2017-09-09 13:50:47 +0200
committerDimitri Staessens <[email protected]>2017-09-12 08:33:26 -0600
commit45c6615484ffe347654c34decb72ff1ef9bde0f3 (patch)
treef912e0eef256371f61b87a5a78e7604d9b623194 /src/ipcpd/normal/fa.c
parent7c69c0f6b25a199bb3632eea66ccb7de1db06ccc (diff)
downloadouroboros-45c6615484ffe347654c34decb72ff1ef9bde0f3.tar.gz
ouroboros-45c6615484ffe347654c34decb72ff1ef9bde0f3.zip
ipcpd: Revise internals of normal IPCP
This removes the RIB as a datastructure and CDAP as the protocol between IPCPs. CDAP, the rib and related sources are deprecated. The link-state protocol policy is udpated to use its own protocol based on a simple broadcast strategy along a tree. The neighbors struct is deprecated and moved to the library as a generic notifier component.
Diffstat (limited to 'src/ipcpd/normal/fa.c')
-rw-r--r--src/ipcpd/normal/fa.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/ipcpd/normal/fa.c b/src/ipcpd/normal/fa.c
index 682dc5c6..e684abd2 100644
--- a/src/ipcpd/normal/fa.c
+++ b/src/ipcpd/normal/fa.c
@@ -28,7 +28,6 @@
#include <ouroboros/logs.h>
#include <ouroboros/fqueue.h>
-#include <ouroboros/rib.h>
#include <ouroboros/errno.h>
#include <ouroboros/dev.h>
#include <ouroboros/ipcp-dev.h>
@@ -38,7 +37,6 @@
#include "fa.h"
#include "sdu_sched.h"
#include "ipcp.h"
-#include "ribconfig.h"
#include "dt.h"
#include <pthread.h>
@@ -59,9 +57,9 @@ struct {
struct sdu_sched * sdu_sched;
} fa;
-static int sdu_handler(int fd,
- qoscube_t qc,
- struct shm_du_buff * sdb)
+static void sdu_handler(int fd,
+ qoscube_t qc,
+ struct shm_du_buff * sdb)
{
pthread_rwlock_rdlock(&fa.flows_lock);
@@ -69,12 +67,10 @@ static int sdu_handler(int fd,
pthread_rwlock_unlock(&fa.flows_lock);
ipcp_sdb_release(sdb);
log_warn("Failed to forward SDU.");
- return -1;
+ return;
}
pthread_rwlock_unlock(&fa.flows_lock);
-
- return 0;
}
static void destroy_conn(int fd)