Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use a TUN device and embedded PPP code, instead of using pppd #1048

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Use a TUN device and embedded PPP code, instead of using pppd #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
72de57a
Add patch provided by @rain2fog in #801
DimitriPapadopoulos Dec 18, 2020
3b469c3
Apply patch provided by @rain2fog in #801
DimitriPapadopoulos Dec 8, 2020
f2e0f9d
Clean up after applying patch
DimitriPapadopoulos Dec 10, 2020
08a6ad2
When using a tun device, do not try to kill pppd
DimitriPapadopoulos Dec 15, 2022
3072abd
Add experimental option --tun
DimitriPapadopoulos Jun 21, 2023
f9c70af
Merge 'tun' config value if set in source configuration
DblD Sep 25, 2023
cb8051d
Compile without <linux/if_ppp.h>
DimitriPapadopoulos Mar 3, 2024
2d75e9a
Add the new `tun` option to the documentation
DimitriPapadopoulos Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ AC_CHECK_HEADERS([net/route.h], [], AC_MSG_ERROR([Required header not found]), [
# Checks for optional header files.
AC_CHECK_HEADERS([ \
libutil.h \
linux/if_ppp.h \
linux/if_tun.h \
mach/mach.h \
pty.h \
semaphore.h \
Expand Down
8 changes: 6 additions & 2 deletions doc/openfortivpn.1.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ openfortivpn \- Client for PPP+TLS VPN tunnel services
[\fB\-\-otp\-delay=\fI<delay>\fR]
[\fB\-\-no\-ftm\-push\fR]
[\fB\-\-realm=\fI<realm>\fR]
[\fB\-\-tun=\fI<bool>\fR]
[\fB\-\-ifname=\fI<interface>\fR]
[\fB\-\-set\-routes=\fI<bool>\fR]
[\fB\-\-no\-routes\fR]
Expand Down Expand Up @@ -106,6 +107,9 @@ authentication based on OTP will be used instead.
Connect to the specified authentication realm. Defaults to empty, which
is usually what you want.
.TP
\fB\-\-tun=\fI<bool>\fR
Set to create a TUN device and use internal PPP code (experimental).
.TP
\fB\-\-ifname=\fI<interface>\fR
Bind the connection to the specified network interface.
.TP
Expand Down Expand Up @@ -182,9 +186,9 @@ OpenSSL ciphers to use. If default does not work, you can try alternatives
such as HIGH:!MD5:!RC4 or as suggested by the Cipher: line in the output of
\fBopenssl\fP(1) (e.g. AES256-GCM-SHA384):

$ openssl s_client -connect \fI<host:port>\fR
$ openssl s_client -connect \fI<host:port>\fR

(default: HIGH:!aNULL:!kRSA:!PSK:!SRP:!MD5:!RC4)
(default: HIGH:!aNULL:!kRSA:!PSK:!SRP:!MD5:!RC4)

\fBApplies to TLS v1.2 or lower only, not to be used with TLS v1.3 ciphers.\fR
.TP
Expand Down
3 changes: 3 additions & 0 deletions src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ const struct vpn_config invalid_cfg = {
.no_ftm_push = -1,
.pinentry = NULL,
.realm = {'\0'},
.tun = -1,
.iface_name = {'\0'},
.sni = {'\0'},
.set_routes = -1,
Expand Down Expand Up @@ -538,6 +539,8 @@ void merge_config(struct vpn_config *dst, struct vpn_config *src)
free(dst->pinentry);
dst->pinentry = src->pinentry;
}
if (src->tun != invalid_cfg.tun)
dst->tun = src->tun;
if (src->realm[0])
strcpy(dst->realm, src->realm);
if (src->iface_name[0])
Expand Down
1 change: 1 addition & 0 deletions src/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ struct vpn_config {
unsigned int otp_delay;
int no_ftm_push;
char *pinentry;
int tun;
char iface_name[IF_NAMESIZE];
char realm[REALM_SIZE + 1];

Expand Down
5 changes: 5 additions & 0 deletions src/http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,11 @@ static int parse_xml_config(struct tunnel *tunnel, const char *buffer)
if (!gateway)
log_warn("No gateway address, using interface for routing\n");

if (tunnel->config->tun) {
tunnel->ipv4.ip_addr.s_addr = inet_addr(gateway);
tunnel->ipv4.peer_addr.s_addr = inet_addr("192.0.2.1");
}

// The dns search string
val = buffer;
while ((val = xml_find('<', "dns", val, 2))) {
Expand Down
Loading