summaryrefslogtreecommitdiff
path: root/src/ipcpd/normal/dir.c
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-08-28 20:10:22 +0000
committerSander Vrijders <sander.vrijders@ugent.be>2017-08-28 20:10:22 +0000
commite8875c08ac04a1d9aca342d94d4f788239334f72 (patch)
tree4a96be10ea1b9f3d03bb2fd10f3f2e403c1dd934 /src/ipcpd/normal/dir.c
parentc3185b9a6e471b534a370b2d913425962af88654 (diff)
parent999b5dec615ce4cfb30ee909bdd16e79a5e2a1ce (diff)
downloadouroboros-e8875c08ac04a1d9aca342d94d4f788239334f72.tar.gz
ouroboros-e8875c08ac04a1d9aca342d94d4f788239334f72.zip
Merged in dstaesse/ouroboros/be-deprecate-gam (pull request #572)
Be deprecate gam
Diffstat (limited to 'src/ipcpd/normal/dir.c')
-rw-r--r--src/ipcpd/normal/dir.c92
1 files changed, 22 insertions, 70 deletions
diff --git a/src/ipcpd/normal/dir.c b/src/ipcpd/normal/dir.c
index feae7013..2e2c113a 100644
--- a/src/ipcpd/normal/dir.c
+++ b/src/ipcpd/normal/dir.c
@@ -46,80 +46,21 @@
struct dht * dht;
-static uint64_t find_peer_addr(void)
+int dir_init(void)
{
- ssize_t i;
- char ** members;
- ssize_t n_members;
- size_t reset;
- char path[RIB_MAX_PATH_LEN + 1];
-
- strcpy(path, MEMBERS_PATH);
-
- reset = strlen(path);
-
- n_members = rib_children(path, &members);
- if (n_members == 1) {
- freepp(ssize_t, members, n_members);
- return 0;
- }
-
- for (i = 0; i < n_members; ++i) {
- uint64_t addr;
- rib_path_append(path, members[i]);
- if (rib_read(path, &addr, sizeof(addr)) != sizeof(addr)) {
- log_err("Failed to read address from RIB.");
- freepp(ssize_t, members, n_members);
- return ipcpi.dt_addr;
- }
-
- if (addr != ipcpi.dt_addr) {
- freepp(ssize_t, members, n_members);
- return addr;
- }
-
- path[reset] = '\0';
- }
-
- freepp(ssize_t, members, n_members);
-
- return 0;
-}
-
-int dir_init()
-{
- uint64_t addr;
-
dht = dht_create(ipcpi.dt_addr);
if (dht == NULL)
return -ENOMEM;
- addr = find_peer_addr();
- if (addr == ipcpi.dt_addr) {
- log_err("Failed to get peer address.");
- dht_destroy(dht);
- return -EPERM;
- }
-
- if (addr != 0) {
- size_t retr = 0;
- log_dbg("Enrolling directory with peer %" PRIu64 ".", addr);
- /* NOTE: we could try other members if dht_enroll times out. */
- while (dht_enroll(dht, addr)) {
- if (retr++ == ENROL_RETR) {
- dht_destroy(dht);
- return -EPERM;
- }
-
- log_dbg("Directory enrollment failed, retrying...");
- sleep(ENROL_INTV);
- }
-
- log_dbg("Directory enrolled.");
+ return 0;
+}
- return 0;
- }
+void dir_fini(void)
+{
+ dht_destroy(dht);
+}
+int dir_bootstrap(void) {
log_dbg("Bootstrapping directory.");
/* TODO: get parameters for bootstrap from IRM tool. */
@@ -133,9 +74,20 @@ int dir_init()
return 0;
}
-void dir_fini(void)
-{
- dht_destroy(dht);
+int dir_enroll(uint64_t addr) {
+ size_t retr = 0;
+ log_dbg("Enrolling directory with peer %" PRIu64 ".", addr);
+ while (dht_enroll(dht, addr)) {
+ if (retr++ == ENROL_RETR)
+ return -EPERM;
+
+ log_dbg("Directory enrollment failed, retrying...");
+ sleep(ENROL_INTV);
+ }
+
+ log_dbg("Directory enrolled.");
+
+ return 0;
}
int dir_reg(const uint8_t * hash)