summaryrefslogtreecommitdiff
path: root/src/ipcpd/shim-udp/main.c
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-04-06 14:53:35 +0000
committerSander Vrijders <sander.vrijders@ugent.be>2017-04-06 14:53:35 +0000
commita520f53970e59b4663b2baa70dd458175154622b (patch)
treeec99dad12704ff9728d408fb93b356d449fe70c8 /src/ipcpd/shim-udp/main.c
parent0f9954dd086834a996d5585d923364b765b752e4 (diff)
parenta4ce5e7d47d27c8b582e27b38ce61c9cb9735992 (diff)
downloadouroboros-a520f53970e59b4663b2baa70dd458175154622b.tar.gz
ouroboros-a520f53970e59b4663b2baa70dd458175154622b.zip
Merged in dstaesse/ouroboros/be-race-fix (pull request #469)
ipcpd: Fix race condition with concurrent allocs
Diffstat (limited to 'src/ipcpd/shim-udp/main.c')
-rw-r--r--src/ipcpd/shim-udp/main.c42
1 files changed, 37 insertions, 5 deletions
diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index ea3d1f88..b1a88fae 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -232,11 +232,11 @@ static int ipcp_udp_port_req(struct sockaddr_in * c_saddr,
char * dst_name,
qoscube_t cube)
{
- int skfd;
- int fd;
-
+ struct timespec ts = {0, FD_UPDATE_TIMEOUT * 1000};
struct sockaddr_in f_saddr;
socklen_t f_saddr_len = sizeof(f_saddr);
+ int skfd;
+ int fd;
log_dbg("Port request arrived from UDP port %d",
ntohs(c_saddr->sin_port));
@@ -271,6 +271,17 @@ static int ipcp_udp_port_req(struct sockaddr_in * c_saddr,
pthread_mutex_lock(&ipcpi.alloc_lock);
+ while (ipcpi.alloc_id != -1 && ipcp_get_state() == IPCP_OPERATIONAL)
+ pthread_cond_timedwait(&ipcpi.alloc_cond,
+ &ipcpi.alloc_lock,
+ &ts);
+
+ if (ipcp_get_state() != IPCP_OPERATIONAL) {
+ log_dbg("Won't allocate over non-operational IPCP.");
+ pthread_mutex_unlock(&ipcpi.alloc_lock);
+ return -1;
+ }
+
/* reply to IRM */
fd = ipcp_flow_req_arr(getpid(), dst_name, cube);
if (fd < 0) {
@@ -291,6 +302,9 @@ static int ipcp_udp_port_req(struct sockaddr_in * c_saddr,
pthread_rwlock_unlock(&ipcpi.state_lock);
pthread_mutex_unlock(&ipcpi.alloc_lock);
+ ipcpi.alloc_id = fd;
+ pthread_cond_broadcast(&ipcpi.alloc_cond);
+
log_dbg("Pending allocation request, fd %d, UDP port (%d, %d).",
fd, ntohs(f_saddr.sin_port), ntohs(c_saddr->sin_port));
@@ -1063,14 +1077,32 @@ static int ipcp_udp_flow_alloc(int fd,
static int ipcp_udp_flow_alloc_resp(int fd,
int response)
{
- int skfd = -1;
+ struct timespec ts = {0, FD_UPDATE_TIMEOUT * 1000};
+ int skfd = -1;
struct sockaddr_in f_saddr;
struct sockaddr_in r_saddr;
- socklen_t len = sizeof(r_saddr);
+ socklen_t len = sizeof(r_saddr);
if (response)
return 0;
+ pthread_mutex_lock(&ipcpi.alloc_lock);
+
+ while (ipcpi.alloc_id != fd && ipcp_get_state() == IPCP_OPERATIONAL)
+ pthread_cond_timedwait(&ipcpi.alloc_cond,
+ &ipcpi.alloc_lock,
+ &ts);
+
+ if (ipcp_get_state() != IPCP_OPERATIONAL) {
+ pthread_mutex_unlock(&ipcpi.alloc_lock);
+ return -1;
+ }
+
+ ipcpi.alloc_id = -1;
+ pthread_cond_broadcast(&ipcpi.alloc_cond);
+
+ pthread_mutex_unlock(&ipcpi.alloc_lock);
+
pthread_rwlock_rdlock(&ipcpi.state_lock);
pthread_rwlock_wrlock(&udp_data.flows_lock);