summaryrefslogtreecommitdiff
path: root/src/ipcpd/normal/connmgr.c
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-03-15 08:09:15 +0000
committerSander Vrijders <sander.vrijders@ugent.be>2017-03-15 08:09:15 +0000
commitb44cdf4069f30e342dfb80ec3eef7dd5c37367d0 (patch)
treee95f8f7aebc8af0003ff5d99fc1ef9b4d93be534 /src/ipcpd/normal/connmgr.c
parent366fcbec4fb7de21c553f24efb977b45bf27f2e6 (diff)
parente26ddb08e8a5f37ca2caf9bd7a96c956816e96de (diff)
downloadouroboros-b44cdf4069f30e342dfb80ec3eef7dd5c37367d0.tar.gz
ouroboros-b44cdf4069f30e342dfb80ec3eef7dd5c37367d0.zip
Merged in dstaesse/ouroboros/be-fixes (pull request #401)
Be fixes
Diffstat (limited to 'src/ipcpd/normal/connmgr.c')
-rw-r--r--src/ipcpd/normal/connmgr.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ipcpd/normal/connmgr.c b/src/ipcpd/normal/connmgr.c
index 87daeddb..c86beae8 100644
--- a/src/ipcpd/normal/connmgr.c
+++ b/src/ipcpd/normal/connmgr.c
@@ -1,7 +1,7 @@
/*
* Ouroboros - Copyright (C) 2016 - 2017
*
- * Handles the different AP connections
+ * Handles AE connections
*
* Dimitri Staessens <dimitri.staessens@ugent.be>
* Sander Vrijders <sander.vrijders@ugent.be>
@@ -285,7 +285,10 @@ int connmgr_alloc(struct ae * ae,
return -1;
}
- conn->flow_info.qs = *qs;
+ if (qs != NULL)
+ conn->flow_info.qs = *qs;
+ else
+ memset(&conn->flow_info.qs, 0, sizeof(conn->flow_info.qs));
if (flow_alloc_res(conn->flow_info.fd)) {
log_err("Flow allocation to %s failed.", dst_name);