diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-05-14 21:59:46 +0200 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-05-14 21:59:46 +0200 |
| commit | 1712f5d78567bbad7a0608fb1428be000a83fe4a (patch) | |
| tree | 0831f200a4e2d38d68393a4bccfbd2d5c48d2586 /src/irmd/main.c | |
| parent | 43228f68f8e577015fe8116ab145fcc45ab789e7 (diff) | |
| parent | 8f1e46eab45ba0f497f05d6fe18fb83d8590b3e9 (diff) | |
| download | ouroboros-1712f5d78567bbad7a0608fb1428be000a83fe4a.tar.gz ouroboros-1712f5d78567bbad7a0608fb1428be000a83fe4a.zip | |
Merged in sandervrijders/ouroboros/be (pull request #84)
lib, ipcpd, irmd: Add QoS cube definition
Diffstat (limited to 'src/irmd/main.c')
| -rw-r--r-- | src/irmd/main.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c index d266273d..65c173de 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -24,7 +24,6 @@ #include <ouroboros/config.h> #include <ouroboros/logs.h> -#include <ouroboros/common.h> #include <ouroboros/sockets.h> #include <ouroboros/irm.h> #include <ouroboros/ipcp.h> @@ -35,6 +34,8 @@ #include <ouroboros/dif_config.h> #include <ouroboros/shm_du_map.h> #include <ouroboros/bitmap.h> +#include <ouroboros/flow.h> +#include <ouroboros/qos.h> #include <sys/socket.h> #include <sys/un.h> @@ -56,12 +57,6 @@ #define IRMD_THREADPOOL_SIZE 3 #endif -enum flow_state { - FLOW_NULL = 0, - FLOW_PENDING, - FLOW_ALLOCATED -}; - struct ipcp_entry { struct list_head next; instance_name_t * api; @@ -927,6 +922,8 @@ static struct port_map_entry * flow_alloc(pid_t pid, struct port_map_entry * pme; instance_name_t * ipcp; + /* FIXME: Map qos_spec to qos_cube */ + pthread_mutex_lock(&instance->s_lock); if (instance->shutdown) { pthread_mutex_unlock(&instance->s_lock); @@ -965,7 +962,7 @@ static struct port_map_entry * flow_alloc(pid_t pid, dst_name, src_ap_name, src_ae_name, - qos) < 0) { + QOS_CUBE_BE) < 0) { pthread_mutex_lock(&instance->r_lock); list_del(&pme->next); |