summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-08-28 20:12:55 +0200
committerdimitri staessens <dimitri.staessens@ugent.be>2017-08-28 20:49:34 +0200
commit999b5dec615ce4cfb30ee909bdd16e79a5e2a1ce (patch)
tree3c61b136719f262059c9485d789244a9aff5ef8d /src
parent9de8dc4948cf7ce239232aae0889c39ffa39ede2 (diff)
downloadouroboros-999b5dec615ce4cfb30ee909bdd16e79a5e2a1ce.tar.gz
ouroboros-999b5dec615ce4cfb30ee909bdd16e79a5e2a1ce.zip
ipcpd: Address comments on 176698e
Diffstat (limited to 'src')
-rw-r--r--src/ipcpd/normal/connmgr.c3
-rw-r--r--src/ipcpd/normal/dt.c2
-rw-r--r--src/ipcpd/normal/main.c2
-rw-r--r--src/ipcpd/normal/pol/link_state.c5
-rw-r--r--src/ipcpd/normal/sdu_sched.c2
5 files changed, 4 insertions, 10 deletions
diff --git a/src/ipcpd/normal/connmgr.c b/src/ipcpd/normal/connmgr.c
index 11f83247..fa43b97a 100644
--- a/src/ipcpd/normal/connmgr.c
+++ b/src/ipcpd/normal/connmgr.c
@@ -207,9 +207,8 @@ int connmgr_ae_init(enum ae_id id,
ae = connmgr.aes + id;
- if (pthread_mutex_init(&ae->lock, NULL)) {
+ if (pthread_mutex_init(&ae->lock, NULL))
return -1;
- }
if (pthread_cond_init(&ae->cond, NULL)) {
pthread_mutex_destroy(&ae->lock);
diff --git a/src/ipcpd/normal/dt.c b/src/ipcpd/normal/dt.c
index aa089852..282f6bee 100644
--- a/src/ipcpd/normal/dt.c
+++ b/src/ipcpd/normal/dt.c
@@ -207,7 +207,7 @@ int dt_init(enum pol_routing pr,
if (connmgr_ae_init(AEID_DT, &info, dt.nbs)) {
log_err("Failed to register with connmgr.");
goto fail_connmgr_ae_init;
- };
+ }
if (routing_init(pr, dt.nbs)) {
log_err("Failed to init routing.");
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index bef04b7a..0a41f883 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -250,7 +250,7 @@ static int normal_ipcp_enroll(const char * dst,
if (dt_start()) {
log_err("Failed to initialize IPCP components.");
goto fail_dt_start;
- };
+ }
if (connmgr_alloc(AEID_DT, dst, NULL, &dt_conn)) {
log_err("Failed to create a data transfer flow.");
diff --git a/src/ipcpd/normal/pol/link_state.c b/src/ipcpd/normal/pol/link_state.c
index 6bc59d6b..512ced7f 100644
--- a/src/ipcpd/normal/pol/link_state.c
+++ b/src/ipcpd/normal/pol/link_state.c
@@ -130,11 +130,6 @@ static int link_state_neighbor_event(enum nb_event event,
size_t len;
uint8_t * data;
- /* Only announce the flow if our address is bigger
- if (ipcpi.dt_addr < conn.conn_info.addr)
- return 0;
- */
-
path[0] = '\0';
sprintf(fso_name, "%" PRIu64 "-%" PRIu64,
ipcpi.dt_addr, conn.conn_info.addr);
diff --git a/src/ipcpd/normal/sdu_sched.c b/src/ipcpd/normal/sdu_sched.c
index 045d536a..10b0f02f 100644
--- a/src/ipcpd/normal/sdu_sched.c
+++ b/src/ipcpd/normal/sdu_sched.c
@@ -172,7 +172,7 @@ void sdu_sched_add(struct sdu_sched * sdu_sched,
{
qoscube_t qc;
- /* assert(sdu_sched); */
+ assert(sdu_sched);
ipcp_flow_get_qoscube(fd, &qc);
flow_set_add(sdu_sched->set[qc], fd);