summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ipcpd/normal/connmgr.c2
-rw-r--r--src/ipcpd/normal/dir.c4
-rw-r--r--src/ipcpd/normal/enroll.c9
-rw-r--r--src/ipcpd/normal/enroll.h3
-rw-r--r--src/ipcpd/normal/main.c4
-rw-r--r--src/lib/dev.c56
6 files changed, 45 insertions, 33 deletions
diff --git a/src/ipcpd/normal/connmgr.c b/src/ipcpd/normal/connmgr.c
index fa43b97a..9feac0f6 100644
--- a/src/ipcpd/normal/connmgr.c
+++ b/src/ipcpd/normal/connmgr.c
@@ -22,7 +22,7 @@
#define _POSIX_C_SOURCE 200112L
-#define OUROBOROS_PREFIX "Connection manager"
+#define OUROBOROS_PREFIX "connection-manager"
#include <ouroboros/dev.h>
#include <ouroboros/cacep.h>
diff --git a/src/ipcpd/normal/dir.c b/src/ipcpd/normal/dir.c
index 2e2c113a..d2cda4f9 100644
--- a/src/ipcpd/normal/dir.c
+++ b/src/ipcpd/normal/dir.c
@@ -69,7 +69,7 @@ int dir_bootstrap(void) {
return -ENOMEM;
}
- log_dbg("Directory bootstrapped.");
+ log_info("Directory bootstrapped.");
return 0;
}
@@ -85,7 +85,7 @@ int dir_enroll(uint64_t addr) {
sleep(ENROL_INTV);
}
- log_dbg("Directory enrolled.");
+ log_info("Directory enrolled.");
return 0;
}
diff --git a/src/ipcpd/normal/enroll.c b/src/ipcpd/normal/enroll.c
index fc541859..cad14fd8 100644
--- a/src/ipcpd/normal/enroll.c
+++ b/src/ipcpd/normal/enroll.c
@@ -22,7 +22,7 @@
#define _POSIX_C_SOURCE 199309L
-#define OUROBOROS_PREFIX "Enrollment"
+#define OUROBOROS_PREFIX "enrollment"
#include <ouroboros/endian.h>
#include <ouroboros/errno.h>
@@ -64,7 +64,7 @@ struct {
pthread_t listener;
} enroll;
-static int send_rcv_enroll_msg(int fd)
+static int send_rcv_enroll_msg(int fd)
{
enroll_msg_t req = ENROLL_MSG__INIT;
enroll_msg_t * reply;
@@ -277,10 +277,9 @@ static void * enroll_handle(void * o)
return 0;
}
-int enroll_boot(struct conn * conn,
- const char * dst)
+int enroll_boot(struct conn * conn)
{
- log_dbg("Getting boot information from %s.", dst);
+ log_dbg("Getting boot information.");
if (send_rcv_enroll_msg(conn->flow_info.fd)) {
log_err("Failed to enroll.");
diff --git a/src/ipcpd/normal/enroll.h b/src/ipcpd/normal/enroll.h
index 3b277e44..7622447f 100644
--- a/src/ipcpd/normal/enroll.h
+++ b/src/ipcpd/normal/enroll.h
@@ -37,8 +37,7 @@ void enroll_stop(void);
void enroll_bootstrap(const struct ipcp_config * conf);
-int enroll_boot(struct conn * conn,
- const char * dst);
+int enroll_boot(struct conn * conn);
int enroll_done(struct conn * conn,
int result);
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index fa31b9be..bc135c31 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -237,7 +237,7 @@ static int normal_ipcp_enroll(const char * dst,
}
/* Get boot state from peer. */
- if (enroll_boot(&er_conn, dst)) {
+ if (enroll_boot(&er_conn)) {
log_err("Failed to get boot information.");
goto fail_enroll_boot;
}
@@ -277,7 +277,7 @@ static int normal_ipcp_enroll(const char * dst,
if (connmgr_dealloc(AEID_ENROLL, &er_conn))
log_warn("Failed to deallocate enrollment flow.");
- log_dbg("Enrolled with %s.", dst);
+ log_info("Enrolled with %s.", dst);
info->dir_hash_algo = ipcpi.dir_hash_algo;
strcpy(info->dif_name, ipcpi.dif_name);
diff --git a/src/lib/dev.c b/src/lib/dev.c
index e02d66d0..47fec48d 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -75,19 +75,21 @@ enum port_state {
};
struct frcti {
- bool used;
+ bool used;
- struct timespec last_snd;
- bool snd_drf;
- uint64_t snd_lwe;
- uint64_t snd_rwe;
+ struct timespec last_snd;
+ bool snd_drf;
+ uint64_t snd_lwe;
+ uint64_t snd_rwe;
- struct timespec last_rcv;
- bool rcv_drf;
- uint64_t rcv_lwe;
- uint64_t rcv_rwe;
+ struct timespec last_rcv;
+ bool rcv_drf;
+ uint64_t rcv_lwe;
+ uint64_t rcv_rwe;
- uint16_t conf_flags;
+ uint16_t conf_flags;
+
+ pthread_rwlock_t lock;
};
struct port {
@@ -296,7 +298,7 @@ static int frcti_send(int fd,
clock_gettime(CLOCK_REALTIME_COARSE, &now);
- pthread_rwlock_wrlock(&ai.lock);
+ pthread_rwlock_wrlock(&frcti->lock);
/* Check if sender inactivity is true. */
if (!frcti->snd_drf && ts_diff_ms(&now, &frcti->last_snd) > 2 * MPL)
@@ -313,16 +315,16 @@ static int frcti_send(int fd,
pci->seqno = frcti->snd_lwe++;
if (frct_pci_ser(sdb, pci, frcti->conf_flags & FRCTFERRCHCK)) {
- pthread_rwlock_unlock(&ai.lock);
+ pthread_rwlock_unlock(&frcti->lock);
return -1;
}
if (finalize_write(fd, shm_du_buff_get_idx(sdb))) {
- pthread_rwlock_unlock(&ai.lock);
+ pthread_rwlock_unlock(&frcti->lock);
return -ENOTALLOC;
}
- pthread_rwlock_unlock(&ai.lock);
+ pthread_rwlock_unlock(&frcti->lock);
return 0;
}
@@ -348,11 +350,11 @@ static int frcti_configure(int fd,
pci.flags |= FLAG_DATA_RUN;
pci.type |= PDU_TYPE_CONFIG;
- pthread_rwlock_wrlock(&ai.lock);
+ pthread_rwlock_wrlock(&frcti->lock);
frcti->conf_flags = pci.conf_flags;
- pthread_rwlock_unlock(&ai.lock);
+ pthread_rwlock_unlock(&frcti->lock);
if (frcti_send(fd, &pci, sdb)) {
shm_rdrbuff_remove(ai.rdrb, shm_du_buff_get_idx(sdb));
@@ -416,11 +418,11 @@ static ssize_t frcti_read(int fd)
sdb = shm_rdrbuff_get(ai.rdrb, idx);
- pthread_rwlock_wrlock(&ai.lock);
+ pthread_rwlock_wrlock(&frcti->lock);
/* SDU may be corrupted. */
if (frct_pci_des(sdb, &pci, frcti->conf_flags & FRCTFERRCHCK)) {
- pthread_rwlock_unlock(&ai.lock);
+ pthread_rwlock_unlock(&frcti->lock);
shm_rdrbuff_remove(ai.rdrb, idx);
return -EAGAIN;
}
@@ -432,7 +434,7 @@ static ssize_t frcti_read(int fd)
/* We don't accept packets when there is receiver inactivity. */
if (frcti->rcv_drf && !(pci.flags & FLAG_DATA_RUN)) {
- pthread_rwlock_unlock(&ai.lock);
+ pthread_rwlock_unlock(&frcti->lock);
shm_rdrbuff_remove(ai.rdrb, idx);
return -EAGAIN;
}
@@ -449,7 +451,7 @@ static ssize_t frcti_read(int fd)
frcti->last_rcv = now;
- pthread_rwlock_unlock(&ai.lock);
+ pthread_rwlock_unlock(&frcti->lock);
if (!(pci.type & PDU_TYPE_DATA))
shm_rdrbuff_remove(ai.rdrb, idx);
@@ -546,7 +548,8 @@ static int flow_init(int port_id,
int ouroboros_init(const char * ap_name)
{
- int i = 0;
+ int i;
+ int j;
int ret = -ENOMEM;
assert(ai.ap_name == NULL);
@@ -582,6 +585,12 @@ int ouroboros_init(const char * ap_name)
for (i = 0; i < AP_MAX_FLOWS; ++i) {
flow_clear(i);
frcti_clear(i);
+
+ if (pthread_rwlock_init(&ai.frcti[i].lock, NULL)) {
+ for (j = i - 1; j >= 0 ; j--)
+ pthread_rwlock_destroy(&ai.frcti[j].lock);
+ goto fail_frct_lock;
+ }
}
ai.ports = malloc(sizeof(*ai.ports) * SYS_MAX_FLOWS);
@@ -638,6 +647,9 @@ int ouroboros_init(const char * ap_name)
fail_ap_name:
free(ai.ports);
fail_ports:
+ for (i = 0; i < AP_MAX_FLOWS; ++i)
+ pthread_rwlock_destroy(&ai.frcti[i].lock);
+ fail_frct_lock:
free(ai.frcti);
fail_frcti:
free(ai.flows);
@@ -674,6 +686,8 @@ void ouroboros_fini()
shm_rdrbuff_remove(ai.rdrb, idx);
flow_fini(i);
}
+
+ pthread_rwlock_destroy(&ai.frcti[i].lock);
}
for (i = 0; i < SYS_MAX_FLOWS; ++i) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-16 04:37:53 +0000