summaryrefslogtreecommitdiff
path: root/src/irmd/main.c
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-05-22 10:31:08 +0200
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-05-22 10:31:08 +0200
commit5da36185bde40772eb46592fcda9a4636f1c5cd4 (patch)
treefd83242e72c0a8c2d33e0eec4aef344ff6b2f2c7 /src/irmd/main.c
parentd53fd8ef0228f287568cc51b87733780591308fc (diff)
parenta81e1dfb377ef3e53c2a158ea438f27773ceb25d (diff)
downloadouroboros-5da36185bde40772eb46592fcda9a4636f1c5cd4.tar.gz
ouroboros-5da36185bde40772eb46592fcda9a4636f1c5cd4.zip
Merged in dstaesse/ouroboros/be-dealloc (pull request #103)
lib, irmd, ipcpd: Flow deallocation over shim UDP
Diffstat (limited to 'src/irmd/main.c')
-rw-r--r--src/irmd/main.c37
1 files changed, 28 insertions, 9 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c
index 28f82751..f1993960 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -318,11 +318,6 @@ static int reg_name_entry_destroy(struct reg_name_entry * e)
free(e->name);
instance_name_destroy(e->api);
- if (e->req_ap_name != NULL)
- free(e->req_ap_name);
- if (e->req_ae_name != NULL)
- free(e->req_ae_name);
-
free(e);
e = NULL;
@@ -389,7 +384,6 @@ static int reg_name_entry_del_name(char * name)
return 0;
list_del(&e->next);
-
reg_name_entry_destroy(e);
return 0;
@@ -821,6 +815,7 @@ static struct port_map_entry * flow_accept(pid_t pid,
LOG_DBGF("Unregistered AP calling accept().");
return NULL;
}
+
if (rne->accept) {
rw_lock_unlock(&instance->reg_lock);
rw_lock_unlock(&instance->state_lock);
@@ -1016,6 +1011,12 @@ static int flow_alloc_res(int port_id)
return -1;
}
+ if (e->state == FLOW_NULL) {
+ rw_lock_unlock(&instance->flows_lock);
+ rw_lock_unlock(&instance->state_lock);
+ return -1;
+ }
+
if (e->state == FLOW_ALLOCATED) {
rw_lock_unlock(&instance->flows_lock);
rw_lock_unlock(&instance->state_lock);
@@ -1105,6 +1106,7 @@ static struct port_map_entry * flow_req_arr(pid_t pid,
{
struct reg_name_entry * rne;
struct port_map_entry * pme;
+ bool acc_wait = true;
pme = malloc(sizeof(*pme));
if (pme == NULL) {
@@ -1133,13 +1135,19 @@ static struct port_map_entry * flow_req_arr(pid_t pid,
pme->n_pid = rne->api->id;
- rne->req_ap_name = strdup(ap_name);
- rne->req_ae_name = strdup(ae_name);
-
list_add(&pme->next, &instance->port_map);
pthread_mutex_lock(&rne->acc_lock);
+ rne->req_ap_name = ap_name;
+ rne->req_ae_name = ae_name;
+
+ if (rne->accept == false) {
+ pthread_mutex_unlock(&rne->acc_lock);
+ LOG_WARN("This AP is not accepting flow allocations.");
+ return NULL;
+ }
+
rne->flow_arrived = 0;
pthread_mutex_unlock(&rne->acc_lock);
@@ -1147,6 +1155,13 @@ static struct port_map_entry * flow_req_arr(pid_t pid,
if (pthread_cond_signal(&rne->acc_signal))
LOG_ERR("Failed to send signal.");
+ while (acc_wait) {
+ sched_yield();
+ pthread_mutex_lock(&rne->acc_lock);
+ acc_wait = (rne->flow_arrived != -1);
+ pthread_mutex_unlock(&rne->acc_lock);
+ }
+
rw_lock_unlock(&instance->flows_lock);
rw_lock_unlock(&instance->reg_lock);
rw_lock_unlock(&instance->state_lock);
@@ -1202,6 +1217,8 @@ static int flow_dealloc_ipcp(int port_id)
return 0;
}
+ bmp_release(instance->port_ids, port_id);
+
list_del(&e->next);
rw_lock_unlock(&instance->flows_lock);
@@ -1245,8 +1262,10 @@ static void irm_destroy(struct irm * irm)
struct port_map_entry * e = list_entry(h,
struct port_map_entry,
next);
+
list_del(&e->next);
free(e);
+
}
if (irm->dum != NULL)