diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-07-08 13:44:15 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-07-08 13:44:15 +0200 |
| commit | a4058de51793b7b866ad9b9f52001bb34ca57e8b (patch) | |
| tree | 35c55d50cea6e77c23bf63472ad95f755846c145 /src/ipcpd | |
| parent | 00dba20de7462c07866d321597697456a0ae8555 (diff) | |
| parent | f224dbb901842b021e231e4f3d7c42e62babcdb3 (diff) | |
| download | ouroboros-a4058de51793b7b866ad9b9f52001bb34ca57e8b.tar.gz ouroboros-a4058de51793b7b866ad9b9f52001bb34ca57e8b.zip | |
Merged in dstaesse/ouroboros/be-ops (pull request #167)
ipcpd: Deprecate ipcp_reg/ipcp_unreg
Diffstat (limited to 'src/ipcpd')
| -rw-r--r-- | src/ipcpd/ipcp-ops.h | 4 | ||||
| -rw-r--r-- | src/ipcpd/ipcp.c | 21 | ||||
| -rw-r--r-- | src/ipcpd/local/main.c | 2 | ||||
| -rw-r--r-- | src/ipcpd/shim-eth-llc/main.c | 2 | ||||
| -rw-r--r-- | src/ipcpd/shim-udp/main.c | 2 |
5 files changed, 0 insertions, 31 deletions
diff --git a/src/ipcpd/ipcp-ops.h b/src/ipcpd/ipcp-ops.h index 40c331ec..8f444a79 100644 --- a/src/ipcpd/ipcp-ops.h +++ b/src/ipcpd/ipcp-ops.h @@ -32,10 +32,6 @@ struct ipcp_ops { int (* ipcp_bootstrap)(struct dif_config * conf); int (* ipcp_enroll)(char * dif_name, char * n_1_dif); - int (* ipcp_reg)(char ** dif_names, - size_t len); - int (* ipcp_unreg)(char ** dif_names, - size_t len); int (* ipcp_name_reg)(char * name); int (* ipcp_name_unreg)(char * name); int (* ipcp_flow_alloc)(pid_t n_api, diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c index 28004a92..444d17bb 100644 --- a/src/ipcpd/ipcp.c +++ b/src/ipcpd/ipcp.c @@ -188,27 +188,6 @@ void * ipcp_main_loop(void * o) msg->n_1_dif); break; - - case IPCP_MSG_CODE__IPCP_REG: - if (_ipcp->ops->ipcp_reg == NULL) { - LOG_ERR("Reg unsupported."); - break; - - } - ret_msg.has_result = true; - ret_msg.result = - _ipcp->ops->ipcp_reg(msg->dif_names, msg->len); - break; - case IPCP_MSG_CODE__IPCP_UNREG: - if (_ipcp->ops->ipcp_unreg == NULL) { - LOG_ERR("Unreg unsupported."); - break; - } - ret_msg.has_result = true; - ret_msg.result = - _ipcp->ops->ipcp_unreg(msg->dif_names, - msg->len); - break; case IPCP_MSG_CODE__IPCP_NAME_REG: if (_ipcp->ops->ipcp_name_reg == NULL) { LOG_ERR("Ap_reg unsupported."); diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c index d72269b8..fcf5f879 100644 --- a/src/ipcpd/local/main.c +++ b/src/ipcpd/local/main.c @@ -557,8 +557,6 @@ static struct ipcp * ipcp_local_create() ops->ipcp_bootstrap = ipcp_local_bootstrap; ops->ipcp_enroll = NULL; /* shim */ - ops->ipcp_reg = NULL; /* shim */ - ops->ipcp_unreg = NULL; /* shim */ ops->ipcp_name_reg = ipcp_local_name_reg; ops->ipcp_name_unreg = ipcp_local_name_unreg; ops->ipcp_flow_alloc = ipcp_local_flow_alloc; diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c index f82438c6..87458359 100644 --- a/src/ipcpd/shim-eth-llc/main.c +++ b/src/ipcpd/shim-eth-llc/main.c @@ -1224,8 +1224,6 @@ static int eth_llc_ipcp_flow_dealloc(int port_id) static struct ipcp_ops eth_llc_ops = { .ipcp_bootstrap = eth_llc_ipcp_bootstrap, .ipcp_enroll = NULL, /* shim */ - .ipcp_reg = NULL, /* shim */ - .ipcp_unreg = NULL, /* shim */ .ipcp_name_reg = eth_llc_ipcp_name_reg, .ipcp_name_unreg = eth_llc_ipcp_name_unreg, .ipcp_flow_alloc = eth_llc_ipcp_flow_alloc, diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c index ddf4e80e..1b0bec07 100644 --- a/src/ipcpd/shim-udp/main.c +++ b/src/ipcpd/shim-udp/main.c @@ -1539,8 +1539,6 @@ static struct ipcp * ipcp_udp_create() ops->ipcp_bootstrap = ipcp_udp_bootstrap; ops->ipcp_enroll = NULL; /* shim */ - ops->ipcp_reg = NULL; /* shim */ - ops->ipcp_unreg = NULL; /* shim */ ops->ipcp_name_reg = ipcp_udp_name_reg; ops->ipcp_name_unreg = ipcp_udp_name_unreg; ops->ipcp_flow_alloc = ipcp_udp_flow_alloc; |