diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2011-08-20 17:24:02 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2011-08-20 17:24:02 +0100 |
| commit | 8acaed657eb4db47c448c8a582810bf301ff47ef (patch) | |
| tree | 84beca817e796bc28bbb49104656e0bdcf3b264a /ipif | |
| parent | 0ae8e6867facf7eb8055533a642026d7c9e9cf38 (diff) | |
| parent | 0789c49b475067e89dcd39ffd2cf11871dcb7e80 (diff) | |
| download | userv-utils-8acaed657eb4db47c448c8a582810bf301ff47ef.tar.gz | |
Merge branch 'zealot'
Conflicts:
.gitignore
ipif/Makefile
Diffstat (limited to 'ipif')
| -rw-r--r-- | ipif/.cvsignore | 5 | ||||
| -rw-r--r-- | ipif/forwarder.c | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/ipif/.cvsignore b/ipif/.cvsignore deleted file mode 100644 index d9a8d7c..0000000 --- a/ipif/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -service -automech.[ch] -udptunnel-forwarder -udptunnel-reconf -blowfishtest diff --git a/ipif/forwarder.c b/ipif/forwarder.c index 66f8690..7a81403 100644 --- a/ipif/forwarder.c +++ b/ipif/forwarder.c @@ -84,7 +84,7 @@ static int n_mechs; static const struct mechanism *mechs[MAXMECHS]; static struct mechdata *md_in[MAXMECHS], *md_out[MAXMECHS]; -static size_t maxprefix, maxsuffix; +static int maxprefix, maxsuffix; static struct buffer buf_in, buf_out; static unsigned char *accum_buf; @@ -183,7 +183,8 @@ static void inbound(void) { static unsigned long npackets, nbytes; struct sockaddr_in this_saddr; - int r, i, different, this_saddrlen; + size_t this_saddrlen; + int r, i, different; const char *emsg; buf_in.start= buf_in.base+1; @@ -429,7 +430,8 @@ int main(int argc, const char *const *const argv_in) { if (keepalive) { tnow= now(); - if (tnow >= nextsendka && public_remote_specd) sendpacket("\300",1); + if (tnow >= nextsendka && public_remote_specd) + sendpacket((unsigned char*)"\300",1); polltimeout= (nextsendka - tnow)*1000; } else { polltimeout= -1; |