From 9dae2ebbfd271cb5186ce810578a3629d4cc90bd Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 1 Jun 2017 16:23:51 +0200
Subject: [PATCH] gluon-mesh-vpn-fastd: respondd: adjust for new site.conf mesh
VPN structure
Fixes #1130
---
package/gluon-mesh-vpn-fastd/src/respondd.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/package/gluon-mesh-vpn-fastd/src/respondd.c b/package/gluon-mesh-vpn-fastd/src/respondd.c
index 7354783a3..87d69e07e 100644
--- a/package/gluon-mesh-vpn-fastd/src/respondd.c
+++ b/package/gluon-mesh-vpn-fastd/src/respondd.c
@@ -276,11 +276,15 @@ static struct json_object * get_mesh_vpn(void) {
if (!site)
goto end;
- struct json_object *fastd_mesh_vpn;
- if (!json_object_object_get_ex(site, "fastd_mesh_vpn", &fastd_mesh_vpn))
+ struct json_object *mesh_vpn;
+ if (!json_object_object_get_ex(site, "mesh_vpn", &mesh_vpn))
goto end;
- ret = get_peer_group(fastd_mesh_vpn, peers);
+ struct json_object *mesh_vpn_fastd;
+ if (!json_object_object_get_ex(mesh_vpn, "fastd", &mesh_vpn_fastd))
+ goto end;
+
+ ret = get_peer_group(mesh_vpn_fastd, peers);
end:
json_object_put(site);
--
GitLab