X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fuml_device.c;h=970e462a8b34fcf60248aa3751fa63a48e084d5a;hb=0912276c6467aa3ee6f570b31245367319da572a;hp=4b574e814a3284d0abd0027e3db015d0540b1f3c;hpb=95baa36f10743d4d2bd6f6ff05457f77bd14e96d;p=tinc diff --git a/src/uml_device.c b/src/uml_device.c index 4b574e81..970e462a 100644 --- a/src/uml_device.c +++ b/src/uml_device.c @@ -63,11 +63,11 @@ static bool setup_device(void) { } name; struct timeval tv; - if(!get_config_string(lookup_config(config_tree, "Device"), &device)) { + if(!get_config_string(lookup_config(&config_tree, "Device"), &device)) { xasprintf(&device, RUNSTATEDIR "/%s.umlsocket", identname); } - get_config_string(lookup_config(config_tree, "Interface"), &iface); + get_config_string(lookup_config(&config_tree, "Interface"), &iface); if((write_fd = socket(PF_UNIX, SOCK_DGRAM, 0)) < 0) { logger(DEBUG_ALWAYS, LOG_ERR, "Could not open write %s: %s", device_info, strerror(errno)); @@ -108,7 +108,7 @@ static bool setup_device(void) { name.zero = 0; name.pid = getpid(); gettimeofday(&tv, NULL); - name.usecs = tv.tv_usec; + name.usecs = (int) tv.tv_usec; memcpy(&data_sun.sun_path, &name, sizeof(name)); if(bind(data_fd, (struct sockaddr *)&data_sun, sizeof(data_sun)) < 0) { @@ -196,7 +196,7 @@ void close_device(void) { } static bool read_packet(vpn_packet_t *packet) { - int inlen; + ssize_t inlen; switch(state) { case 0: {