motiejus/vtun
1
Fork 0
Code Releases Activity

buy back changes from bug3541341-5591 for better compile

Browse Source
This commit is contained in:
mtbishop 2012-07-09 01:01:08 +00:00
parent 6a3866dab4
commit f581627ebc
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cfg_file.y
View File

@ -18,7 +18,7 @@
*/
/*
* $Id: cfg_file.y,v 1.8.2.5 2012/07/07 07:14:17 mtbishop Exp $
* $Id: cfg_file.y,v 1.8.2.6 2012/07/09 01:01:08 mtbishop Exp $
*/
#include "config.h"
@ -321,13 +321,13 @@ host_option: '\n'
parse_host->flags |= $2;
}
| K_NAT_HACK NUM {
#ifdef ENABLE_NAT_HACK
parse_host->flags &= ~VTUN_NAT_HACK_MASK;
parse_host->flags |= $2;
#else
cfg_error("This vtund binary was built with the NAT hack disabled for security purposes.");
#endif
| K_NAT_HACK NUM {
#ifdef ENABLE_NAT_HACK
parse_host->flags &= ~VTUN_NAT_HACK_MASK;
parse_host->flags |= $2;
#else
cfg_error("This vtund binary was built with the NAT hack disabled for security purposes.");
#endif
}
| K_SRCADDR '{' srcaddr_options '}'

6
lfd_lzo.c
View File

@ -17,7 +17,7 @@
*/
/*
* $Id: lfd_lzo.c,v 1.5.2.4 2012/07/07 07:14:17 mtbishop Exp $
* $Id: lfd_lzo.c,v 1.5.2.5 2012/07/09 01:01:08 mtbishop Exp $
*/
/* LZO compression module */
@ -104,7 +104,7 @@ int free_lzo()
*/
int comp_lzo(int len, char *in, char **out)
{
unsigned int zlen = 0;
lzo_uint zlen = 0;
int err;
if( (err=lzo1x_compress((void *)in,len,zbuf,&zlen,wmem)) != LZO_E_OK ){
@ -118,7 +118,7 @@ int comp_lzo(int len, char *in, char **out)
int decomp_lzo(int len, char *in, char **out)
{
unsigned int zlen = 0;
lzo_uint zlen = 0;
int err;
if( (err=lzo1x_decompress((void *)in,len,zbuf,&zlen,wmem)) != LZO_E_OK ){

3
server.c
View File

@ -17,7 +17,7 @@
*/
/*
* $Id: server.c,v 1.9.2.2 2008/01/07 22:36:01 mtbishop Exp $
* $Id: server.c,v 1.9.2.3 2012/07/09 01:01:08 mtbishop Exp $
*/
#include "config.h"
@ -49,6 +49,7 @@
#include "auth.h"
#include "compat.h"
#include "netlib.h"
static volatile sig_atomic_t server_term;
static void sig_term(int sig)

3
vtun.h
View File

@ -17,7 +17,7 @@
*/
/*
* $Id: vtun.h,v 1.12.2.6 2012/07/08 05:32:57 mtbishop Exp $
* $Id: vtun.h,v 1.12.2.7 2012/07/09 01:01:08 mtbishop Exp $
*/
#ifndef _VTUN_H
@ -231,5 +231,6 @@ void client(struct vtun_host *host);
int tunnel(struct vtun_host *host);
int read_config(char *file);
struct vtun_host * find_host(char *host);
inline void clear_nat_hack_flags(int svr);
#endif