diff options
author | Sander Vrijders <[email protected]> | 2017-01-09 16:40:40 +0100 |
---|---|---|
committer | Sander Vrijders <[email protected]> | 2017-01-09 16:40:40 +0100 |
commit | 6c1cfb990f56b2fa87500732cb4f0966616907c7 (patch) | |
tree | 4af3a0e2ce9fc12d7dc759803da70b7f570d6f8a /src/ipcpd/normal | |
parent | e56d24010287127fc6b9c9da8d1f7cf160c50253 (diff) | |
parent | 5273b0f5915956e49bcad4167cca2c1349e8816d (diff) | |
download | ouroboros-6c1cfb990f56b2fa87500732cb4f0966616907c7.tar.gz ouroboros-6c1cfb990f56b2fa87500732cb4f0966616907c7.zip |
Merged in dstaesse/ouroboros/be-list (pull request #340)
Updates to list and fixes LGPL license for library
Diffstat (limited to 'src/ipcpd/normal')
-rw-r--r-- | src/ipcpd/normal/addr_auth.c | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/addr_auth.h | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/crc32.c | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/crc32.h | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/dir.h | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/dt_const.h | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/flow_alloc.proto | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/frct.h | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/pathname.c | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/pathname.h | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/pff.c | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/pff.h | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/pol/flat.c | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/pol/flat.h | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/ribmgr.c | 14 | ||||
-rw-r--r-- | src/ipcpd/normal/ro.proto | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/shm_pci.c | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/shm_pci.h | 2 | ||||
-rw-r--r-- | src/ipcpd/normal/static_info.proto | 2 |
19 files changed, 25 insertions, 25 deletions
diff --git a/src/ipcpd/normal/addr_auth.c b/src/ipcpd/normal/addr_auth.c index 4f7a5a85..a4084ac5 100644 --- a/src/ipcpd/normal/addr_auth.c +++ b/src/ipcpd/normal/addr_auth.c @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * Address authority * diff --git a/src/ipcpd/normal/addr_auth.h b/src/ipcpd/normal/addr_auth.h index 521cfe50..8d67bc66 100644 --- a/src/ipcpd/normal/addr_auth.h +++ b/src/ipcpd/normal/addr_auth.h @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * Address authority * diff --git a/src/ipcpd/normal/crc32.c b/src/ipcpd/normal/crc32.c index 10b9b5f0..98c91fb8 100644 --- a/src/ipcpd/normal/crc32.c +++ b/src/ipcpd/normal/crc32.c @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * 32-bit Cyclic Redundancy Check * diff --git a/src/ipcpd/normal/crc32.h b/src/ipcpd/normal/crc32.h index 080451a4..8580e553 100644 --- a/src/ipcpd/normal/crc32.h +++ b/src/ipcpd/normal/crc32.h @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * 32-bit Cyclic Redundancy Check * diff --git a/src/ipcpd/normal/dir.h b/src/ipcpd/normal/dir.h index 18e6441e..867cb87a 100644 --- a/src/ipcpd/normal/dir.h +++ b/src/ipcpd/normal/dir.h @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * DIF directory * diff --git a/src/ipcpd/normal/dt_const.h b/src/ipcpd/normal/dt_const.h index 55d5067e..c94e9395 100644 --- a/src/ipcpd/normal/dt_const.h +++ b/src/ipcpd/normal/dt_const.h @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * Data Transfer Constants for the IPCP * diff --git a/src/ipcpd/normal/flow_alloc.proto b/src/ipcpd/normal/flow_alloc.proto index 02be47a0..16e8be2c 100644 --- a/src/ipcpd/normal/flow_alloc.proto +++ b/src/ipcpd/normal/flow_alloc.proto @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * Flow allocation message * diff --git a/src/ipcpd/normal/frct.h b/src/ipcpd/normal/frct.h index 39c47cdd..462b8cc3 100644 --- a/src/ipcpd/normal/frct.h +++ b/src/ipcpd/normal/frct.h @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * The Flow and Retransmission control component * diff --git a/src/ipcpd/normal/pathname.c b/src/ipcpd/normal/pathname.c index cf6e08b0..d6d4fd79 100644 --- a/src/ipcpd/normal/pathname.c +++ b/src/ipcpd/normal/pathname.c @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * Functions to construct pathnames * diff --git a/src/ipcpd/normal/pathname.h b/src/ipcpd/normal/pathname.h index dc91b7d9..1d7fffa2 100644 --- a/src/ipcpd/normal/pathname.h +++ b/src/ipcpd/normal/pathname.h @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * Functions to construct pathnames * diff --git a/src/ipcpd/normal/pff.c b/src/ipcpd/normal/pff.c index 513f54b7..2f7d554b 100644 --- a/src/ipcpd/normal/pff.c +++ b/src/ipcpd/normal/pff.c @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * PDU Forwarding Function * diff --git a/src/ipcpd/normal/pff.h b/src/ipcpd/normal/pff.h index b6b475cc..b4a1400b 100644 --- a/src/ipcpd/normal/pff.h +++ b/src/ipcpd/normal/pff.h @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * PDU Forwarding Function * diff --git a/src/ipcpd/normal/pol/flat.c b/src/ipcpd/normal/pol/flat.c index 13eaf215..abcb1ad4 100644 --- a/src/ipcpd/normal/pol/flat.c +++ b/src/ipcpd/normal/pol/flat.c @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * Policy for flat addresses in a distributed way * diff --git a/src/ipcpd/normal/pol/flat.h b/src/ipcpd/normal/pol/flat.h index 7661500b..73d7de8b 100644 --- a/src/ipcpd/normal/pol/flat.h +++ b/src/ipcpd/normal/pol/flat.h @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * Policy for flat addresses in a distributed way * diff --git a/src/ipcpd/normal/ribmgr.c b/src/ipcpd/normal/ribmgr.c index e52db08a..6356d48c 100644 --- a/src/ipcpd/normal/ribmgr.c +++ b/src/ipcpd/normal/ribmgr.c @@ -471,9 +471,9 @@ static int write_ro_msg(struct cdap * neighbor, int ribmgr_init() { - INIT_LIST_HEAD(&rib.flows); - INIT_LIST_HEAD(&rib.subs); - INIT_LIST_HEAD(&rib.ro_ids); + list_head_init(&rib.flows); + list_head_init(&rib.subs); + list_head_init(&rib.ro_ids); rib.root = malloc(sizeof(*(rib.root))); if (rib.root == NULL) @@ -993,7 +993,7 @@ static int ro_id_create(char * name, ro_msg_t * msg) tmp->seqno = msg->seqno; tmp->full_name = strdup(name); - INIT_LIST_HEAD(&tmp->next); + list_head_init(&tmp->next); if (tmp->full_name == NULL) { free(tmp); @@ -1154,7 +1154,7 @@ static int ribmgr_add_flow(int fd) return -1; } - INIT_LIST_HEAD(&flow->next); + list_head_init(&flow->next); flow->instance = instance; flow->fd = fd; @@ -1310,7 +1310,7 @@ int ribmgr_enrol() pthread_rwlock_wrlock(&rib.flows_lock); - assert(!list_empty(&rib.flows)); + assert(!list_is_empty(&rib.flows)); flow = list_first_entry((&rib.flows), struct mgmt_flow, next); instance = flow->instance; @@ -1631,7 +1631,7 @@ int ro_subscribe(const char * name, struct ro_sub_ops * ops) if (sub == NULL) return -ENOMEM; - INIT_LIST_HEAD(&sub->next); + list_head_init(&sub->next); sub->name = strdup(name); if (sub->name == NULL) { diff --git a/src/ipcpd/normal/ro.proto b/src/ipcpd/normal/ro.proto index 308bfe19..cceaae7c 100644 --- a/src/ipcpd/normal/ro.proto +++ b/src/ipcpd/normal/ro.proto @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * RIB object message * diff --git a/src/ipcpd/normal/shm_pci.c b/src/ipcpd/normal/shm_pci.c index ed6bf184..c648618a 100644 --- a/src/ipcpd/normal/shm_pci.c +++ b/src/ipcpd/normal/shm_pci.c @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * Protocol Control Information in Shared Memory Map * diff --git a/src/ipcpd/normal/shm_pci.h b/src/ipcpd/normal/shm_pci.h index d239b535..c1d823bf 100644 --- a/src/ipcpd/normal/shm_pci.h +++ b/src/ipcpd/normal/shm_pci.h @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * Protocol Control Information in Shared Memory Map * diff --git a/src/ipcpd/normal/static_info.proto b/src/ipcpd/normal/static_info.proto index b265d6e4..18f02e36 100644 --- a/src/ipcpd/normal/static_info.proto +++ b/src/ipcpd/normal/static_info.proto @@ -1,5 +1,5 @@ /* - * Ouroboros - Copyright (C) 2016 + * Ouroboros - Copyright (C) 2016 - 2017 * * Static information message * |