diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2017-08-10 19:57:33 +0000 | 
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@ugent.be> | 2017-08-10 19:57:33 +0000 | 
| commit | 2b42b1e1121dfd715a78502a3652d326330b8160 (patch) | |
| tree | 072770c8575c0f5d8248ff5a4a3afa4388fe455c /src/ipcpd | |
| parent | f3d2ce1e668dfcf6b5088bf448b29f96d0ddaa76 (diff) | |
| parent | cf18d69d1e8b238c82940b4ea8173436bd53a1ce (diff) | |
| download | ouroboros-2b42b1e1121dfd715a78502a3652d326330b8160.tar.gz ouroboros-2b42b1e1121dfd715a78502a3652d326330b8160.zip  | |
Merged in sandervrijders/ouroboros/be-clang (pull request #547)
lib, ipcpd, tools: Fix enum assignments
Diffstat (limited to 'src/ipcpd')
| -rw-r--r-- | src/ipcpd/ipcp.c | 5 | ||||
| -rw-r--r-- | src/ipcpd/normal/dht.c | 2 | 
2 files changed, 1 insertions, 6 deletions
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c index b2afdf99..b54bf0b7 100644 --- a/src/ipcpd/ipcp.c +++ b/src/ipcpd/ipcp.c @@ -174,11 +174,6 @@ static void * mainloop(void * o)                          conf.type = conf_msg->ipcp_type;                          strcpy(conf.dif_info.dif_name,                                 conf_msg->dif_info->dif_name); -                        if (conf.dif_info.dif_name == NULL) { -                                log_err("No DIF name provided."); -                                ret_msg.result = -1; -                                break; -                        }                          if (conf_msg->ipcp_type == IPCP_NORMAL) {                                  conf.addr_size      = conf_msg->addr_size;                                  conf.fd_size        = conf_msg->fd_size; diff --git a/src/ipcpd/normal/dht.c b/src/ipcpd/normal/dht.c index 954ca670..5c294c00 100644 --- a/src/ipcpd/normal/dht.c +++ b/src/ipcpd/normal/dht.c @@ -630,7 +630,7 @@ static void lookup_destroy(struct lookup * lu)          case LU_DONE:          case LU_UPDATE:          case LU_COMPLETE: -                lu->state = REQ_NULL; +                lu->state = LU_NULL;                  break;          case LU_NULL:          default:  | 
