From 38de1fd9af5a46c18ce5523b0c48e5f1c8679099 Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Tue, 6 Dec 2016 14:01:32 +0100 Subject: ipcpd: Change IPCP_RUNNING to IPCP_OPERATIONAL Changes a state of the IPCP to a more correct terminology. --- src/ipcpd/normal/dir.c | 6 +++--- src/ipcpd/normal/fmgr.c | 4 ++-- src/ipcpd/normal/main.c | 4 ++-- src/ipcpd/normal/ribmgr.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/ipcpd/normal') diff --git a/src/ipcpd/normal/dir.c b/src/ipcpd/normal/dir.c index 2b3742d9..2a0f112a 100644 --- a/src/ipcpd/normal/dir.c +++ b/src/ipcpd/normal/dir.c @@ -98,7 +98,7 @@ int dir_name_reg(char * name) 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_ERR("IPCP is not in RUNNING state."); return -1; @@ -143,7 +143,7 @@ int dir_name_unreg(char * name) 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_ERR("IPCP is not in RUNNING state."); return -1; @@ -179,7 +179,7 @@ int dir_name_query(char * name) 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 -1; } diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c index 82163aef..ee4f0306 100644 --- a/src/ipcpd/normal/fmgr.c +++ b/src/ipcpd/normal/fmgr.c @@ -130,7 +130,7 @@ static void * fmgr_nm1_acceptor(void * o) (void) o; while (true) { - ipcp_wait_state(IPCP_RUNNING, NULL); + ipcp_wait_state(IPCP_OPERATIONAL, NULL); pthread_rwlock_rdlock(&ipcpi.state_lock); @@ -420,7 +420,7 @@ int fmgr_np1_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_ERR("IPCP is not enrolled yet."); return -1; /* -ENOTINIT */ diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c index 64138838..af199e03 100644 --- a/src/ipcpd/normal/main.c +++ b/src/ipcpd/normal/main.c @@ -108,7 +108,7 @@ static int normal_ipcp_enroll(char * dif_name) } pthread_rwlock_wrlock(&ipcpi.state_lock); - ipcp_set_state(IPCP_RUNNING); + ipcp_set_state(IPCP_OPERATIONAL); pthread_rwlock_unlock(&ipcpi.state_lock); /* FIXME: Remove once we obtain neighbors during enrollment */ @@ -149,7 +149,7 @@ static int normal_ipcp_bootstrap(struct dif_config * conf) pthread_rwlock_wrlock(&ipcpi.state_lock); - ipcp_set_state(IPCP_RUNNING); + ipcp_set_state(IPCP_OPERATIONAL); ipcpi.data->dif_name = conf->dif_name; pthread_rwlock_unlock(&ipcpi.state_lock); diff --git a/src/ipcpd/normal/ribmgr.c b/src/ipcpd/normal/ribmgr.c index 02cbbbfd..f9c5a299 100644 --- a/src/ipcpd/normal/ribmgr.c +++ b/src/ipcpd/normal/ribmgr.c @@ -937,7 +937,7 @@ static int ribmgr_cdap_start(struct cdap * instance, int iid = 0; pthread_rwlock_wrlock(&ipcpi.state_lock); - if (ipcp_get_state() == IPCP_RUNNING && + if (ipcp_get_state() == IPCP_OPERATIONAL && strcmp(name, ENROLLMENT) == 0) { LOG_DBG("New enrollment request."); -- cgit v1.2.3