summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-09-23 10:10:53 +0000
committerSander Vrijders <sander.vrijders@ugent.be>2017-09-23 10:10:53 +0000
commit3fac7e4d0a97f84c8d8a2ccac246abac399ff9fa (patch)
tree52cda24ec11092c2eb66cbe9e527bb49261bb2bd /src
parenta401e818c6064d423cda88c4d6b9c3f1914cb62a (diff)
parent17ab2b6d6bc95337d5fd54e058c0822260dbacf1 (diff)
downloadouroboros-3fac7e4d0a97f84c8d8a2ccac246abac399ff9fa.tar.gz
ouroboros-3fac7e4d0a97f84c8d8a2ccac246abac399ff9fa.zip
Merged in dstaesse/ouroboros/be-bugfixes (pull request #613)
Some bugfixes
Diffstat (limited to 'src')
-rw-r--r--src/ipcpd/normal/dht.c21
-rw-r--r--src/ipcpd/shim-udp/main.c5
2 files changed, 17 insertions, 9 deletions
diff --git a/src/ipcpd/normal/dht.c b/src/ipcpd/normal/dht.c
index 711e176a..be5411da 100644
--- a/src/ipcpd/normal/dht.c
+++ b/src/ipcpd/normal/dht.c
@@ -1964,7 +1964,7 @@ static int kad_handle_join_resp(struct dht * dht,
return -1;
}
- pthread_rwlock_wrlock(&dht->lock);
+ pthread_rwlock_rdlock(&dht->lock);
dht->buckets = bucket_create();
if (dht->buckets == NULL) {
@@ -1995,8 +1995,6 @@ static int kad_handle_join_resp(struct dht * dht,
kad_req_respond(req);
- dht_update_bucket(dht, msg->s_id.data, msg->s_addr);
-
pthread_rwlock_unlock(&dht->lock);
log_dbg("Enrollment of DHT completed.");
@@ -2226,6 +2224,8 @@ static void * dht_handle_sdu(void * o)
uint64_t addr;
buffer_t buf;
size_t i;
+ size_t b;
+ size_t t_expire;
assert(o);
@@ -2250,13 +2250,20 @@ static void * dht_handle_sdu(void * o)
return (void *) -1;
}
- if (msg->has_key && msg->key.len != dht->b) {
+ pthread_rwlock_rdlock(&dht->lock);
+
+ b = dht->b;
+ t_expire = dht->t_expire;
+
+ pthread_rwlock_unlock(&dht->lock);
+
+ if (msg->has_key && msg->key.len != b) {
kad_msg__free_unpacked(msg, NULL);
log_warn("Bad key in message.");
return (void *) -1;
}
- if (msg->has_s_id && !msg->has_b && msg->s_id.len != dht->b) {
+ if (msg->has_s_id && !msg->has_b && msg->s_id.len != b) {
kad_msg__free_unpacked(msg, NULL);
log_warn("Bad source ID in message of type %d.", msg->code);
return (void *) -1;
@@ -2302,9 +2309,9 @@ static void * dht_handle_sdu(void * o)
resp_msg.has_t_refresh = true;
resp_msg.has_t_replicate = true;
resp_msg.alpha = KAD_ALPHA;
- resp_msg.b = dht->b;
+ resp_msg.b = b;
resp_msg.k = KAD_K;
- resp_msg.t_expire = dht->t_expire;
+ resp_msg.t_expire = t_expire;
resp_msg.t_refresh = KAD_T_REFR;
resp_msg.t_replicate = KAD_T_REPL;
break;
diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index f47bb01a..d393dc4b 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -320,11 +320,12 @@ static int ipcp_udp_port_req(struct sockaddr_in * c_saddr,
udp_data.fd_to_uf[fd].udp = f_saddr.sin_port;
pthread_rwlock_unlock(&udp_data.flows_lock);
- pthread_mutex_unlock(&ipcpi.alloc_lock);
ipcpi.alloc_id = fd;
pthread_cond_broadcast(&ipcpi.alloc_cond);
+ pthread_mutex_unlock(&ipcpi.alloc_lock);
+
log_dbg("Pending allocation request, fd %d, UDP port (%d, %d).",
fd, ntohs(f_saddr.sin_port), ntohs(c_saddr->sin_port));
@@ -345,7 +346,7 @@ static int udp_port_to_fd(int udp_port)
static int ipcp_udp_port_alloc_reply(uint16_t src_udp_port,
uint16_t dst_udp_port,
- int response)
+ int response)
{
int fd = -1;
int ret = 0;