X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=tun.c;h=40bf6dd91d8de62c5474f7552d77acd4b2d3e3b7;hp=b0bde38ea7405057fe448ac84e4a2d5e593c9bbc;hb=HEAD;hpb=efacf9e0049ac05c817a88158d0cce5ea9d81b09 diff --git a/tun.c b/tun.c index b0bde38..3ba62b3 100644 --- a/tun.c +++ b/tun.c @@ -1,3 +1,22 @@ +/* + * This file is part of secnet. + * See README for full list of copyright holders. + * + * secnet is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * secnet is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * version 3 along with secnet; if not, see + * https://www.gnu.org/licenses/gpl.html. + */ + #include "secnet.h" #include "util.h" #include "netlink.h" @@ -12,7 +31,7 @@ #ifdef HAVE_NET_IF_H #include -#ifdef HAVE_LINUX_IF_H +#ifdef HAVE_LINUX_IF_TUN_H #include #define LINUX_TUN_SUPPORTED #endif @@ -81,7 +100,6 @@ struct tun { struct buffer_if *buff; /* We receive packets into here and send them to the netlink code. */ netlink_deliver_fn *netlink_to_tunnel; - uint32_t local_address; /* host interface address */ }; static cstring_t tun_flavour_str(uint32_t flavour) @@ -99,7 +117,7 @@ static int tun_beforepoll(void *sst, struct pollfd *fds, int *nfds_io, int *timeout_io) { struct tun *st=sst; - *nfds_io=1; + BEFOREPOLL_WANT_FDS(1); fds[0].fd=st->fd; fds[0].events=POLLIN; return 0; @@ -116,9 +134,10 @@ static void tun_afterpoll(void *sst, struct pollfd *fds, int nfds) } if (fds[0].revents&POLLIN) { BUF_ALLOC(st->buff,"tun_afterpoll"); - buffer_init(st->buff,st->nl.max_start_pad); - l=read(st->fd,st->buff->start,st->buff->len-st->nl.max_start_pad); + buffer_init(st->buff,calculate_max_start_pad()); + l=read(st->fd, st->buff->start, buf_remaining_space(st->buff)); if (l<0) { + if (errno==EINTR || iswouldblock(errno)) return; fatal_perror("tun_afterpoll: read()"); } if (l==0) { @@ -241,10 +260,8 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes) fatal("tun_set_route: unsupported route command type"); break; } - free(network); free(mask); } - free(secnetaddr); - if (st->route_type==TUN_CONFIG_IOCTL) { + if (fd >= 0) { close(fd); } routes->kup=up; @@ -343,6 +360,8 @@ static void tun_phase_hook(void *sst, uint32_t newphase) st->interface_name=safe_malloc(10,"tun_apply"); sprintf(st->interface_name,"tun%d",ppa); st->fd=tun_fd; + setcloexec(if_ifd); + setcloexec(ip_ifd); #else fatal("tun_phase_hook: TUN_FLAVOUR_STREAMS unexpected"); #endif /* HAVE_TUN_STREAMS */ @@ -353,7 +372,10 @@ static void tun_phase_hook(void *sst, uint32_t newphase) to set the TUN device's address, and route to add routes to all our networks. */ - hostaddr=ipaddr_to_string(st->local_address); + setcloexec(st->fd); + setnonblock(st->fd); + + hostaddr=ipaddr_to_string(st->nl.local_address); secnetaddr=ipaddr_to_string(st->nl.secnet_address); snprintf(mtu,sizeof(mtu),"%d",st->nl.mtu); mtu[5]=0; @@ -387,7 +409,7 @@ static void tun_phase_hook(void *sst, uint32_t newphase) sa=(struct sockaddr_in *)&ifr.ifr_addr; FILLZERO(*sa); sa->sin_family=AF_INET; - sa->sin_addr.s_addr=htonl(st->local_address); + sa->sin_addr.s_addr=htonl(st->nl.local_address); if (ioctl(fd,SIOCSIFADDR, &ifr)!=0) { fatal_perror("tun_apply: SIOCSIFADDR"); } @@ -439,8 +461,10 @@ static void tun_phase_hook(void *sst, uint32_t newphase) tun_set_route(st,r); } + add_hook(PHASE_CHILDPERSIST,childpersist_closefd_hook,&st->fd); + /* Register for poll() */ - register_for_poll(st, tun_beforepoll, tun_afterpoll, 1, st->nl.name); + register_for_poll(st, tun_beforepoll, tun_afterpoll, st->nl.name); } static list_t *tun_create(closure_t *self, struct cloc loc, dict_t *context, @@ -451,7 +475,7 @@ static list_t *tun_create(closure_t *self, struct cloc loc, dict_t *context, dict_t *dict; string_t flavour,type; - st=safe_malloc(sizeof(*st),"tun_apply"); + NEW(st); /* First parameter must be a dict */ item=list_elem(args,0); @@ -491,8 +515,6 @@ static list_t *tun_create(closure_t *self, struct cloc loc, dict_t *context, st->route_path=dict_read_string(dict,"route-path",False,"tun-netlink",loc); st->buff=find_cl_if(dict,"buffer",CL_BUFFER,True,"tun-netlink",loc); - st->local_address=string_item_to_ipaddr( - dict_find_item(dict,"local-address", True, "netlink", loc),"netlink"); if (st->tun_flavour==TUN_FLAVOUR_GUESS) { /* If we haven't been told what type of TUN we're using, take