Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 21267 Details for
Bug 34341
openvpn-1.5.0.ebuild
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
files/openvpn-1.5.0.patch
openvpn-1.5.0.patch (text/plain), 5.20 KB, created by
bme
on 2003-11-25 09:09:48 UTC
(
hide
)
Description:
files/openvpn-1.5.0.patch
Filename:
MIME Type:
Creator:
bme
Created:
2003-11-25 09:09:48 UTC
Size:
5.20 KB
patch
obsolete
>diff -bur openvpn-1.5.0.orig/gentoo/openvpn.init openvpn-1.5.0/gentoo/openvpn.init >--- openvpn-1.5.0.orig/gentoo/openvpn.init 2003-11-24 21:16:48.000000000 -0600 >+++ openvpn-1.5.0/gentoo/openvpn.init 2003-11-24 21:18:32.000000000 -0600 >@@ -22,7 +22,7 @@ > # service openvpn status - SIGUSR2 > > # Location of openvpn binary >-openvpn=/usr/local/sbin/openvpn >+openvpn=/usr/sbin/openvpn > > # PID directory > piddir=/var/run/openvpn >Only in openvpn-1.5.0/install-win32: openvpn.nsi >diff -bur openvpn-1.5.0.orig/openvpn.8 openvpn-1.5.0/openvpn.8 >--- openvpn-1.5.0.orig/openvpn.8 2003-11-24 21:16:48.000000000 -0600 >+++ openvpn-1.5.0/openvpn.8 2003-11-24 23:02:46.000000000 -0600 >@@ -172,6 +172,7 @@ > [\ \fB\-\-setenv\fR\ \fIname\ value\fR\ ] > [\ \fB\-\-shaper\fR\ \fIn\fR\ ] > [\ \fB\-\-single\-session\fR\ ] >+[\ \fB\-\-tcp\-retry\fR\ \fIn\fR\ ] > [\ \fB\-\-tls\-auth\fR\ \fIf\fR\ ] > [\ \fB\-\-tls\-cipher\fR\ \fIl\fR\ ] > [\ \fB\-\-tls\-client\fR\ ] >@@ -972,6 +973,10 @@ > seconds of inactivity on the TUN/TAP device. The time length > of inactivity is measured since the last incoming tunnel packet. > .TP >+.B --tcp-retry n >+The number of seconds before the tcp-client will retry to >+establish a connection with the tcp-server (default=5). >+.TP > .B --ping n > Ping remote over the TCP/UDP control channel > if no packets have been sent for at least >diff -bur openvpn-1.5.0.orig/openvpn.c openvpn-1.5.0/openvpn.c >--- openvpn-1.5.0.orig/openvpn.c 2003-11-24 21:16:48.000000000 -0600 >+++ openvpn-1.5.0/openvpn.c 2003-11-24 22:38:26.000000000 -0600 >@@ -1291,7 +1291,7 @@ > } > > /* finalize the TCP/UDP socket */ >- link_socket_init_phase2 (&link_socket, &frame, &signal_received); >+ link_socket_init_phase2 (&link_socket, &frame, &signal_received, options->tcp_retry); > if (signal_received) > { > signal_text = "socket"; >diff -bur openvpn-1.5.0.orig/options.c openvpn-1.5.0/options.c >--- openvpn-1.5.0.orig/options.c 2003-11-24 21:16:48.000000000 -0600 >+++ openvpn-1.5.0/options.c 2003-11-24 22:41:10.000000000 -0600 >@@ -128,6 +128,7 @@ > "--setenv name value : Set a custom environmental variable to pass to script.\n" > "--shaper n : Restrict output to peer to n bytes per second.\n" > "--inactive n : Exit after n seconds of inactivity on TUN/TAP device.\n" >+ "--tcp-retry n : If TCP connection fails, retry every n seconds.\n" > "--ping-exit n : Exit if n seconds pass without reception of remote ping.\n" > "--ping-restart n: Restart if n seconds pass without reception of remote ping.\n" > "--ping-timer-rem: Run the --ping-exit/--ping-restart timer only if we have a\n" >@@ -332,6 +333,7 @@ > { > CLEAR (*o); > o->proto = PROTO_UDPv4; >+ o->tcp_retry = 5; > #ifdef TUNSETPERSIST > o->persist_mode = 1; > #endif >@@ -443,6 +445,7 @@ > > SHOW_BOOL (mlock); > SHOW_INT (inactivity_timeout); >+ SHOW_INT (tcp_retry); > SHOW_INT (ping_send_timeout); > SHOW_INT (ping_rec_timeout); > SHOW_INT (ping_rec_timeout_action); >@@ -1282,6 +1285,11 @@ > ++i; > options->inactivity_timeout = positive (atoi (p[1])); > } >+ else if (streq (p[0], "tcp-retry") && p[1]) >+ { >+ ++i; >+ options->tcp_retry = positive (atoi (p[1])); >+ } > else if (streq (p[0], "proto") && p[1]) > { > ++i; >diff -bur openvpn-1.5.0.orig/options.h openvpn-1.5.0/options.h >--- openvpn-1.5.0.orig/options.h 2003-11-24 21:16:48.000000000 -0600 >+++ openvpn-1.5.0/options.h 2003-11-24 22:04:51.000000000 -0600 >@@ -86,6 +86,7 @@ > > /* Protocol type (PROTO_UDP or PROTO_TCP) */ > int proto; >+ int tcp_retry; /* If tcp connection fails, retry every n seconds */ > > /* Advanced MTU negotiation and datagram fragmentation options */ > int mtu_discover_type; /* used if OS supports setting Path MTU discovery options on socket */ >diff -bur openvpn-1.5.0.orig/socket.c openvpn-1.5.0/socket.c >--- openvpn-1.5.0.orig/socket.c 2003-11-24 21:16:48.000000000 -0600 >+++ openvpn-1.5.0/socket.c 2003-11-24 22:37:00.000000000 -0600 >@@ -353,10 +353,9 @@ > struct sockaddr_in *remote, > const char *remote_dynamic, > bool *remote_changed, >- volatile int *signal_received) >+ volatile int *signal_received, >+ int try_again_seconds) > { >- const int try_again_seconds = 5; >- > msg (M_INFO, "Attempting to establish TCP connection with %s", > print_sockaddr (remote)); > while (true) >@@ -613,7 +612,8 @@ > void > link_socket_init_phase2 (struct link_socket *sock, > const struct frame *frame, >- volatile int *signal_received) >+ volatile int *signal_received, >+ int try_again_seconds) > { > const char *remote_dynamic = NULL; > bool remote_changed = false; >@@ -656,7 +656,8 @@ > { > socket_connect (&sock->sd, &sock->lsa->actual, > remote_dynamic, &remote_changed, >- signal_received); >+ signal_received, >+ try_again_seconds); > > if (*signal_received) > return; >diff -bur openvpn-1.5.0.orig/socket.h openvpn-1.5.0/socket.h >--- openvpn-1.5.0.orig/socket.h 2003-11-24 21:16:48.000000000 -0600 >+++ openvpn-1.5.0/socket.h 2003-11-24 22:39:07.000000000 -0600 >@@ -197,7 +197,8 @@ > > void link_socket_init_phase2 (struct link_socket *sock, > const struct frame *frame, >- volatile int *signal_received); >+ volatile int *signal_received, >+ int try_again_seconds); > > void socket_adjust_frame_parameters (struct frame *frame, int proto); >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 34341
:
21266
|
21267
|
21281
|
21508