summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2017-03-21 16:51:15 +0100
committerSander Vrijders <sander.vrijders@ugent.be>2017-03-21 16:51:15 +0100
commit97d2a1c3c185623c5472e89e78b4d8cc98a06c91 (patch)
tree58425710a8232125faebc48a339797bc3ae1b4b4
parentb04b4933fc7f03aef940b4de5fd43815834951ca (diff)
downloadouroboros-97d2a1c3c185623c5472e89e78b4d8cc98a06c91.tar.gz
ouroboros-97d2a1c3c185623c5472e89e78b4d8cc98a06c91.zip
ipcpd: local: Handle failed flow allocation
When the flow_req_arr returned a negative error, it was not handled correctly in the local IPCP, and an access was made into a table with a negative integer. This handles it correctly.
-rw-r--r--include/ouroboros/ipcp-dev.h6
-rw-r--r--src/ipcpd/local/main.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/include/ouroboros/ipcp-dev.h b/include/ouroboros/ipcp-dev.h
index 81aca1d7..b2d78c6e 100644
--- a/include/ouroboros/ipcp-dev.h
+++ b/include/ouroboros/ipcp-dev.h
@@ -29,9 +29,9 @@
int ipcp_create_r(pid_t api,
int result);
-int ipcp_flow_req_arr(pid_t api,
- char * dst_name,
- char * src_ae_name,
+int ipcp_flow_req_arr(pid_t api,
+ char * dst_name,
+ char * src_ae_name,
qoscube_t cube);
int ipcp_flow_alloc_reply(int fd,
diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index 8d770c94..edb22be6 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -234,13 +234,19 @@ static int ipcp_local_flow_alloc(int fd,
if (ipcp_get_state() != IPCP_OPERATIONAL) {
pthread_rwlock_unlock(&ipcpi.state_lock);
- log_dbg("Won't register with non-enrolled IPCP.");
+ log_dbg("Won't allocate over non-operational IPCP.");
return -1; /* -ENOTENROLLED */
}
pthread_rwlock_wrlock(&local_data.lock);
out_fd = ipcp_flow_req_arr(getpid(), dst_name, src_ae_name, cube);
+ if (out_fd < 0) {
+ log_dbg("Flow allocation failed.");
+ pthread_rwlock_unlock(&local_data.lock);
+ pthread_rwlock_unlock(&ipcpi.state_lock);
+ return -1;
+ }
local_data.in_out[fd] = out_fd;
local_data.in_out[out_fd] = fd;