summaryrefslogtreecommitdiff
path: root/src/ipcpd/local/main.c
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@intec.ugent.be>2016-12-06 14:32:09 +0000
committerdimitri staessens <dimitri.staessens@intec.ugent.be>2016-12-06 14:32:09 +0000
commitd257e862662f5692c5bdd922adf125a5c1f02e7e (patch)
tree6ec73e25c47506a653d972e96fd7be04c0f66592 /src/ipcpd/local/main.c
parent3068c438767fe54a1cced215e6df379a5c7ea8bf (diff)
parent38de1fd9af5a46c18ce5523b0c48e5f1c8679099 (diff)
downloadouroboros-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/local/main.c')
-rw-r--r--src/ipcpd/local/main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index d8614afb..30d2d2bd 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -94,7 +94,7 @@ static void * ipcp_local_sdu_loop(void * o)
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 */
}
@@ -137,7 +137,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);
@@ -163,7 +163,7 @@ static int ipcp_local_bootstrap(struct dif_config * conf)
/* this IPCP doesn't need to maintain its dif_name */
free(conf->dif_name);
- ipcp_set_state(IPCP_RUNNING);
+ ipcp_set_state(IPCP_OPERATIONAL);
pthread_create(&local_data.sduloop, NULL, ipcp_local_sdu_loop, NULL);
@@ -234,7 +234,7 @@ static int ipcp_local_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 register with non-enrolled IPCP.");
return -1; /* -ENOTENROLLED */
@@ -296,7 +296,7 @@ static int ipcp_local_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 */