Skip to content

Commit

Permalink
rfe2636157 - Permit a delayed UDP connection to overcome unpredictable
Browse files Browse the repository at this point in the history
             NAT ports.
  • Loading branch information
mtbishop committed Mar 29, 2009
1 parent cb03b8f commit 6665823
Show file tree
Hide file tree
Showing 12 changed files with 7,898 additions and 13 deletions.
20 changes: 20 additions & 0 deletions TODO
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

netlib.c:196 - set a timeout for waiting for the remote UDP start

NATHack

- unify the config as one (local) setting, and use a connection
cookie passed to coordinate which side goes passive. The server
wins in all ties. auth.c:195

- lose the global variable and move it into the vtun struct. For
now. main.c:54, vtun.h:111


---

Comments, suggestion, wishes and if possible patches are always welcome.
Send them to vtun-users@lists.sourceforge.net .

Bishop Clark <bishop@platypus.bc.ca>

6 changes: 5 additions & 1 deletion cfg_kwords.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

/*
* $Id: cfg_kwords.h,v 1.6.2.2 2008/01/07 22:35:26 mtbishop Exp $
* $Id: cfg_kwords.h,v 1.6.2.3 2009/03/29 10:08:41 mtbishop Exp $
*/

extern int lineno;
Expand Down Expand Up @@ -49,6 +49,8 @@ struct kword cfg_keyword[] = {
{ "encrypt", K_ENCRYPT },
{ "type", K_TYPE },
{ "proto", K_PROT },
{ "nat_hack", K_NAT_HACK },
{ "delay_udp",K_NAT_HACK },
{ "device", K_DEVICE },
{ "ppp", K_PPP },
{ "ifconfig", K_IFCFG },
Expand All @@ -75,6 +77,8 @@ struct kword cfg_param[] = {
{ "tun", VTUN_TUN },
{ "tcp", VTUN_TCP },
{ "udp", VTUN_UDP },
{ "client", VTUN_NAT_HACK_CLIENT },
{ "server", VTUN_NAT_HACK_SERVER },
{ "lzo", VTUN_LZO },
{ "zlib", VTUN_ZLIB },
{ "wait", 1 },
Expand Down
76 changes: 76 additions & 0 deletions config.h.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/* config.h.in. Generated automatically from configure.in by autoheader. */

/* Define to empty if the keyword does not work. */
#undef const

/* Define as __inline if that's what the C compiler calls it. */
#undef inline

/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS

/* Define if you have the gettimeofday function. */
#undef HAVE_GETTIMEOFDAY

/* Define if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H

/* Define if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H

/* Define if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H

/* Define if you have the <netinet/ip.h> header file. */
#undef HAVE_NETINET_IP_H

/* Define if you have the <netinet/tcp.h> header file. */
#undef HAVE_NETINET_TCP_H

/* Define if you have the <netinet/in_systm.h> header file. */
#undef HAVE_NETINET_IN_SYSTM_H

/* Define if you have the <netdb.h> header file. */
#undef HAVE_NETDB_H

/* Define if you have the <sched.h> header file. */
#undef HAVE_SCHED_H

/* Define if you have the <sys/resource.h> header file. */
#undef HAVE_SYS_RESOURCE_H

/* Define if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H

/* Define if you have the <sys/sockio.h> header file. */
#undef HAVE_SYS_SOCKIO_H

/* Define if you have the <linux/if_tun.h> header file. */
#undef HAVE_LINUX_IF_TUN_H

/* Define if you have setproctitle. */
#undef HAVE_SETPROC_TITLE

#undef HAVE_LIBUTIL_H

/* Define if you have ZLIB */
#undef HAVE_ZLIB

/* Define if you have LZO */
#undef HAVE_LZO

/* Define if you have OpenSSL */
#undef HAVE_SSL

#undef HAVE_SSL_BLOWFISH

#undef HAVE_SSL_AES

#undef HAVE_SSL_EVP

#undef HAVE_SHAPER

#undef ENABLE_NAT_HACK

/* Release version and date */
#undef VTUN_VER
Loading

0 comments on commit 6665823

Please sign in to comment.