projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GitHub CI: check project for warnings with clang/gcc.
[tinc]
/
src
/
vde_device.c
diff --git
a/src/vde_device.c
b/src/vde_device.c
index
73ad713
..
0170af3
100644
(file)
--- a/
src/vde_device.c
+++ b/
src/vde_device.c
@@
-34,7
+34,7
@@
static struct vdepluglib plug;
static struct vdeconn *conn = NULL;
static int port = 0;
static char *group = NULL;
static struct vdeconn *conn = NULL;
static int port = 0;
static char *group = NULL;
-static c
har *device_info
;
+static c
onst char *device_info = "VDE socket"
;
static bool setup_device(void) {
libvdeplug_dynopen(plug);
static bool setup_device(void) {
libvdeplug_dynopen(plug);
@@
-44,8
+44,9
@@
static bool setup_device(void) {
return false;
}
return false;
}
- if(!get_config_string(lookup_config(config_tree, "Device"), &device))
- xasprintf(&device, LOCALSTATEDIR "/run/vde.ctl");
+ if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
+ xasprintf(&device, RUNSTATEDIR "/vde.ctl");
+ }
get_config_string(lookup_config(config_tree, "Interface"), &iface);
get_config_string(lookup_config(config_tree, "Interface"), &iface);
@@
-53,8
+54,6
@@
static bool setup_device(void) {
get_config_string(lookup_config(config_tree, "VDEGroup"), &group);
get_config_string(lookup_config(config_tree, "VDEGroup"), &group);
- device_info = "VDE socket";
-
struct vde_open_args args = {
.port = port,
.group = group,
struct vde_open_args args = {
.port = port,
.group = group,
@@
-62,6
+61,7
@@
static bool setup_device(void) {
};
conn = plug.vde_open(device, identname, &args);
};
conn = plug.vde_open(device, identname, &args);
+
if(!conn) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not open VDE socket %s", device);
return false;
if(!conn) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not open VDE socket %s", device);
return false;
@@
-75,29
+75,35
@@
static bool setup_device(void) {
logger(DEBUG_ALWAYS, LOG_INFO, "%s is a %s", device, device_info);
logger(DEBUG_ALWAYS, LOG_INFO, "%s is a %s", device, device_info);
- if(routing_mode == RMODE_ROUTER)
+ if(routing_mode == RMODE_ROUTER)
{
overwrite_mac = true;
overwrite_mac = true;
+ }
return true;
}
static void close_device(void) {
if(conn) {
return true;
}
static void close_device(void) {
if(conn) {
- plug.vde_close(conn); conn = NULL;
+ plug.vde_close(conn);
+ conn = NULL;
}
}
- if(plug.dl_handle)
+ if(plug.dl_handle)
{
libvdeplug_dynclose(plug);
libvdeplug_dynclose(plug);
+ }
- free(device); device = NULL;
+ free(device);
+ device = NULL;
- free(iface); iface = NULL;
+ free(iface);
+ iface = NULL;
device_info = NULL;
}
static bool read_packet(vpn_packet_t *packet) {
int lenin = (ssize_t)plug.vde_recv(conn, DATA(packet), MTU, 0);
device_info = NULL;
}
static bool read_packet(vpn_packet_t *packet) {
int lenin = (ssize_t)plug.vde_recv(conn, DATA(packet), MTU, 0);
+
if(lenin <= 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
event_exit();
if(lenin <= 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
event_exit();