projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove dropin random() function, as it is not used anymore.
[tinc]
/
src
/
uml_socket
/
device.c
diff --git
a/src/uml_socket/device.c
b/src/uml_socket/device.c
index
9d8bb49
..
de0b4a5
100644
(file)
--- a/
src/uml_socket/device.c
+++ b/
src/uml_socket/device.c
@@
-1,7
+1,7
@@
/*
device.c -- UML network socket
/*
device.c -- UML network socket
- Copyright (C) 2002-200
4 Ivo Timmermans <ivo@tinc-vpn.org>
,
- 2002-200
4
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2002-200
5 Ivo Timmermans
,
+ 2002-200
9
Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-36,9
+36,9
@@
static int request_fd = -1;
static int data_fd = -1;
static int write_fd = -1;
static int state = 0;
static int data_fd = -1;
static int write_fd = -1;
static int state = 0;
-char *device;
+char *device
= NULL
;
char *iface = NULL;
char *iface = NULL;
-char *device_info;
+
static
char *device_info;
extern char *identname;
extern bool running;
extern char *identname;
extern bool running;
@@
-71,7
+71,7
@@
bool setup_device(void)
cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
- asprintf(&device, LOCALSTATEDIR "/run/%s.umlsocket", identname);
+
x
asprintf(&device, LOCALSTATEDIR "/run/%s.umlsocket", identname);
get_config_string(lookup_config(config_tree, "Interface"), &iface);
get_config_string(lookup_config(config_tree, "Interface"), &iface);
@@
-171,6
+171,9
@@
void close_device(void)
close(write_fd);
unlink(device);
close(write_fd);
unlink(device);
+
+ free(device);
+ if(iface) free(iface);
}
bool read_packet(vpn_packet_t *packet)
}
bool read_packet(vpn_packet_t *packet)