j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Don't set $INTERFACE automatically, don't quit on EINTR/EAGAIN.

Browse source
This commit is contained in:
Guus Sliepen 2004-07-17 12:04:30 +00:00
parent dcec713675
commit c44f69a302
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/uml_socket/device.c
View file

@ -39,7 +39,7 @@ static int data_fd = -1;
static int write_fd = -1; static int write_fd = -1;
static int state = 0; static int state = 0;
char *device; char *device;
char *iface; char *iface = NULL;
char *device_info; char *device_info;
extern char *identname; extern char *identname;
@ -75,8 +75,7 @@ bool setup_device(void)
if(!get_config_string(lookup_config(config_tree, "Device"), &device)) if(!get_config_string(lookup_config(config_tree, "Device"), &device))
asprintf(&device, LOCALSTATEDIR "/run/%s.umlsocket", identname); asprintf(&device, LOCALSTATEDIR "/run/%s.umlsocket", identname);
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface)) get_config_string(lookup_config(config_tree, "Interface"), &iface);
iface = device;
device_info = _("UML network socket"); device_info = _("UML network socket");
@ -264,16 +263,18 @@ bool write_packet(vpn_packet_t *packet)
if(state != 2) { if(state != 2) {
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Dropping packet of %d bytes to %s: not connected to UML yet"), ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Dropping packet of %d bytes to %s: not connected to UML yet"),
packet->len, device_info); packet->len, device_info);
return true; return false;
} }
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"), ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info); packet->len, device_info);
if(sendto(write_fd, packet->data, packet->len, 0, &request.sock, sizeof request.sock) < 0) { if(write(write_fd, packet->data, packet->len) < 0) {
logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, if(errno != EINTR && errno != EAGAIN) {
strerror(errno)); logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
running = false; running = false;
}
return false; return false;
} }