diff options
| author | dimitri staessens <dimitri.staessens@ugent.be> | 2017-04-27 16:17:39 +0000 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-04-27 16:17:39 +0000 |
| commit | ee2c0eb9f0777e08b00fe7cdfac912a84dd29cf4 (patch) | |
| tree | 137c34f79897b5f371a65dd14208b77201d1e907 /src/ipcpd/ipcp.c | |
| parent | 1f8f2ebe3bb385593755b69bd264ff5f831a22ae (diff) | |
| parent | b398dbe5cfd12b928e00f9a22cd6826bbdfb18d7 (diff) | |
| download | ouroboros-ee2c0eb9f0777e08b00fe7cdfac912a84dd29cf4.tar.gz ouroboros-ee2c0eb9f0777e08b00fe7cdfac912a84dd29cf4.zip | |
Merged in dstaesse/ouroboros/be-cap (pull request #495)
Be cap
Diffstat (limited to 'src/ipcpd/ipcp.c')
| -rw-r--r-- | src/ipcpd/ipcp.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c index d682309d..7f3ebc73 100644 --- a/src/ipcpd/ipcp.c +++ b/src/ipcpd/ipcp.c @@ -143,9 +143,10 @@ static void * ipcp_main_loop(void * o) ipcp_config_msg_t * conf_msg; struct ipcp_config conf; + struct dif_info info; struct timeval ltv = {(SOCKET_TIMEOUT / 1000), - (SOCKET_TIMEOUT % 1000) * 1000}; + (SOCKET_TIMEOUT % 1000) * 1000}; ssize_t id = (ssize_t) o; @@ -259,7 +260,14 @@ static void * ipcp_main_loop(void * o) break; } - ret_msg.result = ipcpi.ops->ipcp_enroll(msg->dst_name); + ret_msg.result = ipcpi.ops->ipcp_enroll(msg->dst_name, + &info); + + if (ret_msg.result == 0) { + ret_msg.has_dir_hash_algo = true; + ret_msg.dir_hash_algo = info.algo; + ret_msg.dif_name = info.dif_name; + } break; case IPCP_MSG_CODE__IPCP_REG: ret_msg.has_result = true; |