diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-07-12 15:44:04 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-07-12 15:44:04 +0200 |
| commit | 3fc1cd9ec6d8473b40461da79176fe3ec41f47fa (patch) | |
| tree | 0e39c5e9405ba0695eec06c06c77e7e9a22949cb /src/lib | |
| parent | 1a35c29ba743424df0cb27408cf08f7022a1c5f5 (diff) | |
| download | ouroboros-3fc1cd9ec6d8473b40461da79176fe3ec41f47fa.tar.gz ouroboros-3fc1cd9ec6d8473b40461da79176fe3ec41f47fa.zip | |
lib: Remove N-1 DIF param from enroll operation
This removes the parameter N-1 DIF from the enroll operation. IPCPs
should just allocate a flow to a DIF name and let the N-1 DIF resolve
it.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ipcp.c | 12 | ||||
| -rw-r--r-- | src/lib/ipcpd_messages.proto | 27 |
2 files changed, 18 insertions, 21 deletions
diff --git a/src/lib/ipcp.c b/src/lib/ipcp.c index 3fd31f37..373baafd 100644 --- a/src/lib/ipcp.c +++ b/src/lib/ipcp.c @@ -221,20 +221,18 @@ int ipcp_bootstrap(pid_t api, return ret; } -int ipcp_enroll(pid_t api, - char * dif_name, - char * n_1_dif) +int ipcp_enroll(pid_t api, + char * dif_name) { ipcp_msg_t msg = IPCP_MSG__INIT; ipcp_msg_t * recv_msg = NULL; int ret = -1; - if (n_1_dif == NULL || dif_name == NULL) + if (dif_name == NULL) return -EINVAL; msg.code = IPCP_MSG_CODE__IPCP_ENROLL; msg.dif_name = dif_name; - msg.n_1_dif = n_1_dif; recv_msg = send_recv_ipcp_msg(api, &msg); if (recv_msg == NULL) { @@ -252,8 +250,8 @@ int ipcp_enroll(pid_t api, return ret; } -int ipcp_name_reg(pid_t api, - char * name) +int ipcp_name_reg(pid_t api, + char * name) { ipcp_msg_t msg = IPCP_MSG__INIT; ipcp_msg_t * recv_msg = NULL; diff --git a/src/lib/ipcpd_messages.proto b/src/lib/ipcpd_messages.proto index eb764e18..6361c461 100644 --- a/src/lib/ipcpd_messages.proto +++ b/src/lib/ipcpd_messages.proto @@ -14,18 +14,17 @@ enum ipcp_msg_code { message ipcp_msg { required ipcp_msg_code code = 1; optional string dif_name = 2; - optional string n_1_dif = 3; - repeated string dif_names = 4; - optional int32 len = 5; - optional string name = 6; - optional sint32 port_id = 7; - optional string dst_name = 8; - optional string src_ap_name = 9; - optional string src_ae_name = 10; - optional sint32 qos_cube = 11; - optional dif_config_msg conf = 12; - optional sint32 fd = 13; - optional sint32 api = 14; - optional sint32 response = 15; - optional sint32 result = 16; + repeated string dif_names = 3; + optional int32 len = 4; + optional string name = 5; + optional sint32 port_id = 6; + optional string dst_name = 7; + optional string src_ap_name = 8; + optional string src_ae_name = 9; + optional sint32 qos_cube = 10; + optional dif_config_msg conf = 11; + optional sint32 fd = 12; + optional sint32 api = 13; + optional sint32 response = 14; + optional sint32 result = 15; }; |