summaryrefslogtreecommitdiff
path: root/src/lib/ipcp.c
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-06-14 14:56:55 +0200
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-06-14 14:56:55 +0200
commit337ab9fe73b86306b72b9eaae3b7be759f7bbd36 (patch)
treed7b237631ef17df911ec4aef766aba085a63bd30 /src/lib/ipcp.c
parent6019a5b1ee574c8cea485ce5ba68ff77a24b4786 (diff)
parent6271d09bdd17114c3095b7e819a7bcded14f26a5 (diff)
downloadouroboros-337ab9fe73b86306b72b9eaae3b7be759f7bbd36.tar.gz
ouroboros-337ab9fe73b86306b72b9eaae3b7be759f7bbd36.zip
Merge remote-tracking branch 'upstream/be' into be-llc
Diffstat (limited to 'src/lib/ipcp.c')
-rw-r--r--src/lib/ipcp.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/ipcp.c b/src/lib/ipcp.c
index 0d75b73e..89756235 100644
--- a/src/lib/ipcp.c
+++ b/src/lib/ipcp.c
@@ -367,7 +367,6 @@ 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)
{
@@ -375,7 +374,7 @@ int ipcp_flow_alloc(pid_t pid,
ipcp_msg_t * recv_msg = NULL;
int ret = -1;
- if (dst_name == NULL || src_ap_name == NULL || src_ae_name == NULL)
+ if (dst_name == NULL || src_ae_name == NULL)
return -EINVAL;
msg.code = IPCP_MSG_CODE__IPCP_FLOW_ALLOC;
@@ -383,7 +382,6 @@ int ipcp_flow_alloc(pid_t pid,
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;
@@ -438,21 +436,19 @@ int ipcp_flow_alloc_resp(pid_t pid,
int ipcp_flow_req_arr(pid_t pid,
char * dst_name,
- char * src_ap_name,
char * src_ae_name)
{
irm_msg_t msg = IRM_MSG__INIT;
irm_msg_t * recv_msg = NULL;
int port_id = -1;
- if (src_ap_name == NULL || src_ae_name == NULL)
+ if (dst_name == NULL || src_ae_name == NULL)
return -EINVAL;
msg.code = IRM_MSG_CODE__IPCP_FLOW_REQ_ARR;
msg.has_pid = true;
msg.pid = pid;
msg.dst_name = dst_name;
- msg.ap_name = src_ap_name;
msg.ae_name = src_ae_name;
recv_msg = send_recv_irm_msg(&msg);