Makefiles: Use Final.sd.mk to implementing RECHECK_RM

[secnet.git] / tun.c

diff --git a/tun.c b/tun.c
index 3db998f37fcd24d05b910d84111ea779fd9b4fbd..3ba62b3880c1feb522022c7dca67a3b0c8bc8788 100644 (file)
--- 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"
 #include "secnet.h"
 #include "util.h"
 #include "netlink.h"


@@ -12,7 +31,7 @@
 
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>

-#ifdef HAVE_LINUX_IF_H
+#ifdef HAVE_LINUX_IF_TUN_H

 #include <linux/if_tun.h>
 #define LINUX_TUN_SUPPORTED
 #endif
 #include <linux/if_tun.h>
 #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;
     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)
 };
 
 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;
                          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;
     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");
     }
     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 (l<0) {

+           if (errno==EINTR || iswouldblock(errno)) return;

            fatal_perror("tun_afterpoll: read()");
        }
        if (l==0) {
            fatal_perror("tun_afterpoll: read()");
        }
        if (l==0) {


@@ -166,8 +185,14 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes)
     struct subnet_list *nets;
     int32_t i;
     int fd=-1;
     struct subnet_list *nets;
     int32_t i;
     int fd=-1;

+    bool_t up;
+
+    if (routes->options & OPT_SOFTROUTE)
+        up = routes->up;
+    else
+        up = routes->link_quality > LINK_QUALITY_UNUSED;

 
 

-    if (routes->up == routes->kup) return False;
+    if (up == routes->kup) return False;

     if (st->route_type==TUN_CONFIG_IOCTL) {
        if (st->tun_flavour==TUN_FLAVOUR_STREAMS) {
            fd=open(st->ip_path,O_RDWR);
     if (st->route_type==TUN_CONFIG_IOCTL) {
        if (st->tun_flavour==TUN_FLAVOUR_STREAMS) {
            fd=open(st->ip_path,O_RDWR);


@@ -187,20 +212,20 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes)
        network=ipaddr_to_string(nets->list[i].prefix);
        mask=ipaddr_to_string(nets->list[i].mask);
        Message(M_INFO,"%s: %s route %s/%d %s kernel routing table\n",
        network=ipaddr_to_string(nets->list[i].prefix);
        mask=ipaddr_to_string(nets->list[i].mask);
        Message(M_INFO,"%s: %s route %s/%d %s kernel routing table\n",

-               st->nl.name,routes->up?"adding":"deleting",network,
-               nets->list[i].len,routes->up?"to":"from");
+               st->nl.name,up?"adding":"deleting",network,
+               nets->list[i].len,up?"to":"from");

        switch (st->route_type) {
        case TUN_CONFIG_LINUX:
        switch (st->route_type) {
        case TUN_CONFIG_LINUX:

-           sys_cmd(st->route_path,"route",routes->up?"add":"del",
+           sys_cmd(st->route_path,"route",up?"add":"del",

                    "-net",network,"netmask",mask,
                    "gw",secnetaddr,(char *)0);
            break;
        case TUN_CONFIG_BSD:
                    "-net",network,"netmask",mask,
                    "gw",secnetaddr,(char *)0);
            break;
        case TUN_CONFIG_BSD:

-           sys_cmd(st->route_path,"route",routes->up?"add":"del",
+           sys_cmd(st->route_path,"route",up?"add":"del",

                    "-net",network,secnetaddr,mask,(char *)0);
            break;
        case TUN_CONFIG_SOLARIS25:
                    "-net",network,secnetaddr,mask,(char *)0);
            break;
        case TUN_CONFIG_SOLARIS25:

-           sys_cmd(st->route_path,"route",routes->up?"add":"del",
+           sys_cmd(st->route_path,"route",up?"add":"del",

                    network,secnetaddr,(char *)0);
            break;
        case TUN_CONFIG_IOCTL:
                    network,secnetaddr,(char *)0);
            break;
        case TUN_CONFIG_IOCTL:


@@ -211,7 +236,7 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes)
            struct sockaddr_in *sa;
            int action;
            
            struct sockaddr_in *sa;
            int action;
            

-           memset(&rt,0,sizeof(rt));
+           FILLZERO(rt);

            sa=(struct sockaddr_in *)&rt.rt_dst;
            sa->sin_family=AF_INET;
            sa->sin_addr.s_addr=htonl(nets->list[i].prefix);
            sa=(struct sockaddr_in *)&rt.rt_dst;
            sa->sin_family=AF_INET;
            sa->sin_addr.s_addr=htonl(nets->list[i].prefix);


@@ -222,7 +247,7 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes)
            sa->sin_family=AF_INET;
            sa->sin_addr.s_addr=htonl(st->nl.secnet_address);
            rt.rt_flags=RTF_UP|RTF_GATEWAY;
            sa->sin_family=AF_INET;
            sa->sin_addr.s_addr=htonl(st->nl.secnet_address);
            rt.rt_flags=RTF_UP|RTF_GATEWAY;

-           action=routes->up?SIOCADDRT:SIOCDELRT;
+           action=up?SIOCADDRT:SIOCDELRT;

            if (ioctl(fd,action,&rt)<0) {
                fatal_perror("tun_set_route: ioctl()");
            }
            if (ioctl(fd,action,&rt)<0) {
                fatal_perror("tun_set_route: ioctl()");
            }


@@ -235,13 +260,11 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes)
            fatal("tun_set_route: unsupported route command type");
            break;
        }
            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);
     }
        close(fd);
     }

-    routes->kup=routes->up;
+    routes->kup=up;

     return True;
 }
 
     return True;
 }
 


@@ -292,7 +315,7 @@ static void tun_phase_hook(void *sst, uint32_t newphase)
            fatal_perror("%s: can't open device file %s",st->nl.name,
                         st->device_path);
        }
            fatal_perror("%s: can't open device file %s",st->nl.name,
                         st->device_path);
        }

-       memset(&ifr,0,sizeof(ifr));
+       FILLZERO(ifr);

        ifr.ifr_flags = IFF_TUN | IFF_NO_PI; /* Just send/receive IP packets,
                                                no extra headers */
        if (st->interface_name)
        ifr.ifr_flags = IFF_TUN | IFF_NO_PI; /* Just send/receive IP packets,
                                                no extra headers */
        if (st->interface_name)


@@ -337,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;
        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 */
 #else
        fatal("tun_phase_hook: TUN_FLAVOUR_STREAMS unexpected");
 #endif /* HAVE_TUN_STREAMS */


@@ -347,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. */
 
        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;
     secnetaddr=ipaddr_to_string(st->nl.secnet_address);
     snprintf(mtu,sizeof(mtu),"%d",st->nl.mtu);
     mtu[5]=0;


@@ -379,9 +407,9 @@ static void tun_phase_hook(void *sst, uint32_t newphase)
        /* Interface address */
        strncpy(ifr.ifr_name,st->interface_name,IFNAMSIZ);
        sa=(struct sockaddr_in *)&ifr.ifr_addr;
        /* Interface address */
        strncpy(ifr.ifr_name,st->interface_name,IFNAMSIZ);
        sa=(struct sockaddr_in *)&ifr.ifr_addr;

-       memset(sa,0,sizeof(*sa));
+       FILLZERO(*sa);

        sa->sin_family=AF_INET;
        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");
        }
        if (ioctl(fd,SIOCSIFADDR, &ifr)!=0) {
            fatal_perror("tun_apply: SIOCSIFADDR");
        }


@@ -389,7 +417,7 @@ static void tun_phase_hook(void *sst, uint32_t newphase)
        /* Netmask */
        strncpy(ifr.ifr_name,st->interface_name,IFNAMSIZ);
        sa=(struct sockaddr_in *)&ifr.ifr_netmask;
        /* Netmask */
        strncpy(ifr.ifr_name,st->interface_name,IFNAMSIZ);
        sa=(struct sockaddr_in *)&ifr.ifr_netmask;

-       memset(sa,0,sizeof(*sa));
+       FILLZERO(*sa);

        sa->sin_family=AF_INET;
        sa->sin_addr.s_addr=htonl(0xffffffff);
        if (ioctl(fd,SIOCSIFNETMASK, &ifr)!=0) {
        sa->sin_family=AF_INET;
        sa->sin_addr.s_addr=htonl(0xffffffff);
        if (ioctl(fd,SIOCSIFNETMASK, &ifr)!=0) {


@@ -399,7 +427,7 @@ static void tun_phase_hook(void *sst, uint32_t newphase)
        /* Destination address (point-to-point) */
        strncpy(ifr.ifr_name,st->interface_name,IFNAMSIZ);
        sa=(struct sockaddr_in *)&ifr.ifr_dstaddr;
        /* Destination address (point-to-point) */
        strncpy(ifr.ifr_name,st->interface_name,IFNAMSIZ);
        sa=(struct sockaddr_in *)&ifr.ifr_dstaddr;

-       memset(sa,0,sizeof(*sa));
+       FILLZERO(*sa);

        sa->sin_family=AF_INET;
        sa->sin_addr.s_addr=htonl(st->nl.secnet_address);
        if (ioctl(fd,SIOCSIFDSTADDR, &ifr)!=0) {
        sa->sin_family=AF_INET;
        sa->sin_addr.s_addr=htonl(st->nl.secnet_address);
        if (ioctl(fd,SIOCSIFDSTADDR, &ifr)!=0) {


@@ -433,8 +461,10 @@ static void tun_phase_hook(void *sst, uint32_t newphase)
        tun_set_route(st,r);
     }
 
        tun_set_route(st,r);
     }
 

+    add_hook(PHASE_CHILDPERSIST,childpersist_closefd_hook,&st->fd);
+

     /* Register for poll() */
     /* 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,
 }
 
 static list_t *tun_create(closure_t *self, struct cloc loc, dict_t *context,


@@ -445,7 +475,7 @@ static list_t *tun_create(closure_t *self, struct cloc loc, dict_t *context,
     dict_t *dict;
     string_t flavour,type;
 
     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);
 
     /* First parameter must be a dict */
     item=list_elem(args,0);


@@ -485,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->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
 
     if (st->tun_flavour==TUN_FLAVOUR_GUESS) {
        /* If we haven't been told what type of TUN we're using, take