summaryrefslogtreecommitdiff
path: root/src/ipcpd/local/main.c
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@intec.ugent.be>2016-10-26 09:56:31 +0000
committerdimitri staessens <dimitri.staessens@intec.ugent.be>2016-10-26 09:56:31 +0000
commitcc64e52dee3559128293a17a669e94acb48f9309 (patch)
treee4ef544c225e3b118c8a73d868dccaa073b55f11 /src/ipcpd/local/main.c
parent0fd97235ecf670f1fc6db2723c530934b5376458 (diff)
parentf0646875d0bc941e339d305d0c68b13543cd6f2a (diff)
downloadouroboros-cc64e52dee3559128293a17a669e94acb48f9309.tar.gz
ouroboros-cc64e52dee3559128293a17a669e94acb48f9309.zip
Merged in sandervrijders/ouroboros/be-directory (pull request #280)
lib, irmd, ipcpd: Add name querying to IPCPs
Diffstat (limited to 'src/ipcpd/local/main.c')
-rw-r--r--src/ipcpd/local/main.c25
1 files changed, 20 insertions, 5 deletions
diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index 347c7f2f..a8d5c273 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -20,17 +20,18 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#define OUROBOROS_PREFIX "ipcpd/local"
+
#include <ouroboros/config.h>
-#include "ipcp.h"
+#include <ouroboros/logs.h>
#include <ouroboros/errno.h>
#include <ouroboros/dev.h>
#include <ouroboros/fcntl.h>
#include <ouroboros/fqueue.h>
#include <ouroboros/ipcp-dev.h>
#include <ouroboros/local-dev.h>
-#define OUROBOROS_PREFIX "ipcpd/local"
-#include <ouroboros/logs.h>
+#include "ipcp.h"
#include <string.h>
#include <signal.h>
@@ -179,7 +180,7 @@ static int ipcp_local_name_reg(char * name)
{
pthread_rwlock_rdlock(&ipcpi.state_lock);
- if (ipcp_data_add_reg_entry(ipcpi.data, name)) {
+ if (ipcp_data_reg_add_entry(ipcpi.data, name)) {
pthread_rwlock_unlock(&ipcpi.state_lock);
LOG_DBG("Failed to add %s to local registry.", name);
return -1;
@@ -196,7 +197,7 @@ static int ipcp_local_name_unreg(char * name)
{
pthread_rwlock_rdlock(&ipcpi.state_lock);
- ipcp_data_del_reg_entry(ipcpi.data, name);
+ ipcp_data_reg_del_entry(ipcpi.data, name);
pthread_rwlock_unlock(&ipcpi.state_lock);
@@ -205,6 +206,19 @@ static int ipcp_local_name_unreg(char * name)
return 0;
}
+static int ipcp_local_name_query(char * name)
+{
+ int ret;
+
+ pthread_rwlock_rdlock(&ipcpi.state_lock);
+
+ ret = (ipcp_data_reg_has(ipcpi.data, name) ? 0 : -1);
+
+ pthread_rwlock_unlock(&ipcpi.state_lock);
+
+ return ret;
+}
+
static int ipcp_local_flow_alloc(int fd,
char * dst_name,
char * src_ae_name,
@@ -305,6 +319,7 @@ static struct ipcp_ops local_ops = {
.ipcp_enroll = NULL, /* shim */
.ipcp_name_reg = ipcp_local_name_reg,
.ipcp_name_unreg = ipcp_local_name_unreg,
+ .ipcp_name_query = ipcp_local_name_query,
.ipcp_flow_alloc = ipcp_local_flow_alloc,
.ipcp_flow_alloc_resp = ipcp_local_flow_alloc_resp,
.ipcp_flow_dealloc = ipcp_local_flow_dealloc