diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-06-22 16:56:03 +0200 | 
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-06-22 16:56:03 +0200 | 
| commit | 4b5eaafdc9b61307a6a4074366372df3c170372e (patch) | |
| tree | fbb6c556e833e5af3cead917c8ac547853f0382f /src/ipcpd | |
| parent | e24581b93fb3329a1c89b294da15e3375513cf89 (diff) | |
| parent | cf5d13dfd66afd68dd7fe93d009a4539c236b095 (diff) | |
| download | ouroboros-4b5eaafdc9b61307a6a4074366372df3c170372e.tar.gz ouroboros-4b5eaafdc9b61307a6a4074366372df3c170372e.zip | |
Merged in sandervrijders/ouroboros/be (pull request #137)
Be
Diffstat (limited to 'src/ipcpd')
| -rw-r--r-- | src/ipcpd/ipcp-ops.h | 2 | ||||
| -rw-r--r-- | src/ipcpd/ipcp.c | 2 | 
2 files changed, 2 insertions, 2 deletions
| diff --git a/src/ipcpd/ipcp-ops.h b/src/ipcpd/ipcp-ops.h index ffbc9cd7..a1d9f23f 100644 --- a/src/ipcpd/ipcp-ops.h +++ b/src/ipcpd/ipcp-ops.h @@ -30,7 +30,7 @@  struct ipcp_ops {          int   (* ipcp_bootstrap)(struct dif_config * conf); -        int   (* ipcp_enroll)(char * member_name, +        int   (* ipcp_enroll)(char * dif_name,                                char * n_1_dif);          int   (* ipcp_reg)(char ** dif_names,                             size_t  len); diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c index 901abae6..b5108712 100644 --- a/src/ipcpd/ipcp.c +++ b/src/ipcpd/ipcp.c @@ -159,7 +159,7 @@ void * ipcp_main_loop(void * o)                          }                          ret_msg.has_result = true;                          ret_msg.result = -                                _ipcp->ops->ipcp_enroll(msg->member_name, +                                _ipcp->ops->ipcp_enroll(msg->dif_name,                                                          msg->n_1_dif);                          break; | 
