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/lib | |
| 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/lib')
| -rw-r--r-- | src/lib/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/lib/ipcp.c | 32 | ||||
| -rw-r--r-- | src/lib/ipcpd_messages.proto | 11 |
3 files changed, 23 insertions, 23 deletions
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 72e32512..ac9b93b1 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -39,9 +39,6 @@ set(SOURCE_FILES utils.c ) -install(FILES ${IRM_PROTO_HDRS} ${IPCP_PROTO_HDRS} ${DIF_CONFIG_PROTO_HDRS} - DESTINATION include/ouroboros) - add_library(ouroboros SHARED ${SOURCE_FILES} ${IRM_PROTO_SRCS} ${IPCP_PROTO_SRCS} ${DIF_CONFIG_PROTO_SRCS}) diff --git a/src/lib/ipcp.c b/src/lib/ipcp.c index 1f1e5c99..8a4f9629 100644 --- a/src/lib/ipcp.c +++ b/src/lib/ipcp.c @@ -361,13 +361,13 @@ int ipcp_name_unreg(pid_t pid, return ret; } -int ipcp_flow_alloc(pid_t pid, - int port_id, - pid_t n_pid, - char * dst_name, - char * src_ap_name, - char * src_ae_name, - struct qos_spec * qos) +int ipcp_flow_alloc(pid_t pid, + int port_id, + pid_t n_pid, + char * dst_name, + char * src_ap_name, + char * src_ae_name, + enum qos_cube qos) { ipcp_msg_t msg = IPCP_MSG__INIT; ipcp_msg_t * recv_msg = NULL; @@ -376,14 +376,16 @@ int ipcp_flow_alloc(pid_t pid, if (dst_name == NULL || src_ap_name == NULL || src_ae_name == NULL) return -EINVAL; - msg.code = IPCP_MSG_CODE__IPCP_FLOW_ALLOC; - msg.has_port_id = true; - msg.port_id = port_id; - msg.has_pid = true; - msg.pid = n_pid; - msg.src_ap_name = src_ap_name; - msg.src_ae_name = src_ae_name; - msg.dst_name = dst_name; + msg.code = IPCP_MSG_CODE__IPCP_FLOW_ALLOC; + msg.has_port_id = true; + msg.port_id = port_id; + msg.has_pid = true; + msg.pid = n_pid; + msg.src_ap_name = src_ap_name; + msg.src_ae_name = src_ae_name; + msg.dst_name = dst_name; + msg.has_qos_cube = true; + msg.qos_cube = qos; recv_msg = send_recv_ipcp_msg(pid, &msg); if (recv_msg == NULL) diff --git a/src/lib/ipcpd_messages.proto b/src/lib/ipcpd_messages.proto index 901adaa0..63e41986 100644 --- a/src/lib/ipcpd_messages.proto +++ b/src/lib/ipcpd_messages.proto @@ -24,9 +24,10 @@ message ipcp_msg { optional string dst_name = 8; optional string src_ap_name = 9; optional string src_ae_name = 10; - optional dif_config_msg conf = 11; - optional sint32 fd = 12; - optional sint32 pid = 13; - optional sint32 response = 14; - optional sint32 result = 15; + optional sint32 qos_cube = 11; + optional dif_config_msg conf = 12; + optional sint32 fd = 13; + optional sint32 pid = 14; + optional sint32 response = 15; + optional sint32 result = 16; }; |