summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-06-19 17:21:30 +0000
committerSander Vrijders <sander.vrijders@ugent.be>2017-06-19 17:21:30 +0000
commit3961bee6c37b3e53de2ab737c03c130eaa3c74d2 (patch)
tree297e51e7976b63b3dff0d005e2669572e0e1cdcf
parent3fde03d682361af24019b4a4f446fc887ddd7f79 (diff)
parentce0ecb86739583d0b134fdf0f44d0e7372507e2e (diff)
downloadouroboros-3961bee6c37b3e53de2ab737c03c130eaa3c74d2.tar.gz
ouroboros-3961bee6c37b3e53de2ab737c03c130eaa3c74d2.zip
Merged in dstaesse/ouroboros/be-fix-alloc (pull request #518)
ipcpd: Fix flow allocation over normal
-rw-r--r--src/ipcpd/normal/dt_pci.h2
-rw-r--r--src/ipcpd/normal/fa.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/ipcpd/normal/dt_pci.h b/src/ipcpd/normal/dt_pci.h
index 13f782a4..ddcf9066 100644
--- a/src/ipcpd/normal/dt_pci.h
+++ b/src/ipcpd/normal/dt_pci.h
@@ -31,8 +31,6 @@
#include <stdbool.h>
#define DT_PROTO "dt"
-#define FD_FA 1
-#define FD_DHT 2
/* Abstract syntax */
enum dtp_fields {
diff --git a/src/ipcpd/normal/fa.c b/src/ipcpd/normal/fa.c
index d7073617..26ee9037 100644
--- a/src/ipcpd/normal/fa.c
+++ b/src/ipcpd/normal/fa.c
@@ -360,7 +360,7 @@ int fa_alloc_resp(int fd,
assert(qc >= 0 && qc < QOS_CUBE_MAX);
- if (dt_write_sdu(fa.r_addr[fd], qc, FD_FA, sdb)) {
+ if (dt_write_sdu(fa.r_addr[fd], qc, fa.fd, sdb)) {
destroy_conn(fd);
pthread_rwlock_unlock(&fa.flows_lock);
ipcp_sdb_release(sdb);