X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=tun.c;h=dcfd62392d825994665a787a88f3afe588230d3c;hp=b0bde38ea7405057fe448ac84e4a2d5e593c9bbc;hb=7d8d39dc3418b0e709b76f08eb08ab7668239207;hpb=efacf9e0049ac05c817a88158d0cce5ea9d81b09

diff --git a/tun.c b/tun.c
index b0bde38..dcfd623 100644
--- a/tun.c
+++ b/tun.c
@@ -81,7 +81,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)
@@ -116,8 +115,8 @@ 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,st->buff->len-calculate_max_start_pad());
 	if (l<0) {
 	    fatal_perror("tun_afterpoll: read()");
 	}
@@ -353,7 +352,7 @@ 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);
+    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 +386,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");
 	}
@@ -491,8 +490,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