diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-12-06 14:32:09 +0000 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-12-06 14:32:09 +0000 |
| commit | d257e862662f5692c5bdd922adf125a5c1f02e7e (patch) | |
| tree | 6ec73e25c47506a653d972e96fd7be04c0f66592 /src/ipcpd/shim-eth-llc | |
| parent | 3068c438767fe54a1cced215e6df379a5c7ea8bf (diff) | |
| parent | 38de1fd9af5a46c18ce5523b0c48e5f1c8679099 (diff) | |
| download | ouroboros-d257e862662f5692c5bdd922adf125a5c1f02e7e.tar.gz ouroboros-d257e862662f5692c5bdd922adf125a5c1f02e7e.zip | |
Merged in sandervrijders/ouroboros/be-operational-state (pull request #319)
ipcpd: Change IPCP_RUNNING to IPCP_OPERATIONAL
Diffstat (limited to 'src/ipcpd/shim-eth-llc')
| -rw-r--r-- | src/ipcpd/shim-eth-llc/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c index fe2c3336..c7e17ff6 100644 --- a/src/ipcpd/shim-eth-llc/main.c +++ b/src/ipcpd/shim-eth-llc/main.c @@ -629,7 +629,7 @@ static void * eth_llc_ipcp_sdu_writer(void * o) &timeout)) { pthread_rwlock_rdlock(&ipcpi.state_lock); - if (ipcp_get_state() != IPCP_RUNNING) { + if (ipcp_get_state() != IPCP_OPERATIONAL) { pthread_rwlock_unlock(&ipcpi.state_lock); return (void *) -1; /* -ENOTENROLLED */ } @@ -680,7 +680,7 @@ void ipcp_sig_handler(int sig, siginfo_t * info, void * c) if (ipcp_get_state() == IPCP_INIT) ipcp_set_state(IPCP_NULL); - if (ipcp_get_state() == IPCP_RUNNING) + if (ipcp_get_state() == IPCP_OPERATIONAL) ipcp_set_state(IPCP_SHUTDOWN); pthread_rwlock_unlock(&ipcpi.state_lock); @@ -845,7 +845,7 @@ static int eth_llc_ipcp_bootstrap(struct dif_config * conf) eth_llc_data.tx_offset = 0; #endif - ipcp_set_state(IPCP_RUNNING); + ipcp_set_state(IPCP_OPERATIONAL); pthread_create(ð_llc_data.sdu_reader, NULL, @@ -951,7 +951,7 @@ static int eth_llc_ipcp_flow_alloc(int fd, pthread_rwlock_rdlock(&ipcpi.state_lock); - if (ipcp_get_state() != IPCP_RUNNING) { + if (ipcp_get_state() != IPCP_OPERATIONAL) { pthread_rwlock_unlock(&ipcpi.state_lock); LOG_DBG("Won't allocate flow with non-enrolled IPCP."); return -1; /* -ENOTENROLLED */ @@ -1051,7 +1051,7 @@ static int eth_llc_ipcp_flow_dealloc(int fd) pthread_rwlock_rdlock(&ipcpi.state_lock); - if (ipcp_get_state() != IPCP_RUNNING) { + if (ipcp_get_state() != IPCP_OPERATIONAL) { pthread_rwlock_unlock(&ipcpi.state_lock); LOG_DBG("Won't register with non-enrolled IPCP."); return -1; /* -ENOTENROLLED */ |