Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
firmware
FFS Gluon
Commits
edff676d
Unverified
Commit
edff676d
authored
Jun 07, 2021
by
David Bauer
Committed by
GitHub
Jun 07, 2021
Browse files
Merge pull request #2216 from AiyionPrime/meshvpn_core_respondd_simple_tc
gluon-mesh-vpn-core: respondd bandwidth_limit
parents
16c5c641
c71959df
Changes
2
Hide whitespace changes
Inline
Side-by-side
package/gluon-mesh-vpn-core/src/Makefile
View file @
edff676d
...
...
@@ -3,4 +3,4 @@ all: respondd.so
CFLAGS
+=
-Wall
-Werror-implicit-function-declaration
respondd.so
:
respondd.c
$(CC)
$(CPPFLAGS)
$(CFLAGS)
$(LDFLAGS)
-shared
-fPIC
-D_GNU_SOURCE
-o
$@
$^
$(LDLIBS)
-lgluonutil
$(CC)
$(CPPFLAGS)
$(CFLAGS)
$(LDFLAGS)
-shared
-fPIC
-D_GNU_SOURCE
-o
$@
$^
$(LDLIBS)
-lgluonutil
-luci
package/gluon-mesh-vpn-core/src/respondd.c
View file @
edff676d
...
...
@@ -23,13 +23,63 @@
#include <respondd.h>
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <json-c/json.h>
#include <libgluonutil.h>
#include <uci.h>
static
struct
json_object
*
get_bandwidth_limit
(
void
)
{
bool
enabled
=
false
;
int
egress
=
-
1
;
int
ingress
=
-
1
;
struct
json_object
*
ret
=
json_object_new_object
();
struct
uci_context
*
ctx
=
uci_alloc_context
();
if
(
!
ctx
)
goto
disabled
;
ctx
->
flags
&=
~
UCI_FLAG_STRICT
;
struct
uci_package
*
p
;
if
(
uci_load
(
ctx
,
"gluon"
,
&
p
))
goto
disabled
;
struct
uci_section
*
s
=
uci_lookup_section
(
ctx
,
p
,
"mesh_vpn"
);
if
(
!
s
)
goto
disabled
;
const
char
*
enabled_str
=
uci_lookup_option_string
(
ctx
,
s
,
"limit_enabled"
);
if
(
enabled_str
&&
strcmp
(
enabled_str
,
"1"
))
goto
disabled
;
enabled
=
true
;
const
char
*
egress_str
=
uci_lookup_option_string
(
ctx
,
s
,
"limit_egress"
);
if
(
strcmp
(
egress_str
,
"-"
))
egress
=
atoi
(
egress_str
);
const
char
*
ingress_str
=
uci_lookup_option_string
(
ctx
,
s
,
"limit_ingress"
);
if
(
strcmp
(
ingress_str
,
"-"
))
ingress
=
atoi
(
ingress_str
);
if
(
egress
>=
0
)
json_object_object_add
(
ret
,
"egress"
,
json_object_new_int
(
egress
));
if
(
ingress
>=
0
)
json_object_object_add
(
ret
,
"ingress"
,
json_object_new_int
(
ingress
));
disabled:
if
(
ctx
)
uci_free_context
(
ctx
);
json_object_object_add
(
ret
,
"enabled"
,
json_object_new_boolean
(
enabled
));
return
ret
;
}
char
*
read_stdout
(
const
char
*
command
)
{
FILE
*
f
=
popen
(
command
,
"r"
);
if
(
!
f
)
...
...
@@ -89,6 +139,7 @@ static struct json_object * respondd_provider_nodeinfo(void) {
struct
json_object
*
network
=
json_object_new_object
();
struct
json_object
*
mesh_vpn
=
json_object_new_object
();
json_object_object_add
(
mesh_vpn
,
"bandwidth_limit"
,
get_bandwidth_limit
());
json_object_object_add
(
mesh_vpn
,
"provider"
,
get_active_vpn_provider
());
json_object_object_add
(
mesh_vpn
,
"enabled"
,
get_mesh_vpn_enabled
());
json_object_object_add
(
network
,
"mesh_vpn"
,
mesh_vpn
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment