diff options
| author | Michael Mason <ms13sp@gmail.com> | 2009-03-18 13:37:52 +0000 |
|---|---|---|
| committer | Michael Mason <ms13sp@gmail.com> | 2009-03-18 13:37:52 +0000 |
| commit | c9fa1a7056ea1f965fcc22a9d83e125b0ad72282 (patch) | |
| tree | 32ab14b2490dc698eb0c82f1ac1dcd0fd4e312b4 /extra/openvpn/openvpn-2.0.9-persistent.patch | |
| parent | 829a8c02bd6f68d346831806f4d41a0e143cbb33 (diff) | |
| parent | 70f6b7df72309a8270470877ceda9805415a4224 (diff) | |
| download | aports-c9fa1a7056ea1f965fcc22a9d83e125b0ad72282.tar.bz2 aports-c9fa1a7056ea1f965fcc22a9d83e125b0ad72282.tar.xz | |
Merge branch 'master' of git://dev.alpinelinux.org/aports
Diffstat (limited to 'extra/openvpn/openvpn-2.0.9-persistent.patch')
| -rw-r--r-- | extra/openvpn/openvpn-2.0.9-persistent.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/extra/openvpn/openvpn-2.0.9-persistent.patch b/extra/openvpn/openvpn-2.0.9-persistent.patch new file mode 100644 index 000000000..e042124ea --- /dev/null +++ b/extra/openvpn/openvpn-2.0.9-persistent.patch @@ -0,0 +1,44 @@ +diff -ru openvpn-2.0.9~/init.c openvpn-2.0.9/init.c +--- openvpn-2.0.9~/init.c 2008-05-13 23:21:30.000000000 +0200 ++++ openvpn-2.0.9/init.c 2008-05-13 23:22:51.000000000 +0200 +@@ -347,7 +347,8 @@ + msg (M_FATAL|M_OPTERR, + "options --mktun or --rmtun should only be used together with --dev"); + tuncfg (options->dev, options->dev_type, options->dev_node, +- options->tun_ipv6, options->persist_mode); ++ options->tun_ipv6, options->persist_mode, ++ &options->tuntap_options); + return true; + } + #endif +diff -ru openvpn-2.0.9~/tun.c openvpn-2.0.9/tun.c +--- openvpn-2.0.9~/tun.c 2008-05-13 23:21:30.000000000 +0200 ++++ openvpn-2.0.9/tun.c 2008-05-13 23:22:51.000000000 +0200 +@@ -1095,13 +1095,14 @@ + #ifdef TUNSETPERSIST + + void +-tuncfg (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, int persist_mode) ++tuncfg (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, int persist_mode, const struct tuntap_options *options) + { + struct tuntap *tt; + + ALLOC_OBJ (tt, struct tuntap); + clear_tuntap (tt); + tt->type = dev_type_enum (dev, dev_type); ++ tt->options = *options; + open_tun (dev, dev_type, dev_node, ipv6, tt); + if (ioctl (tt->fd, TUNSETPERSIST, persist_mode) < 0) + msg (M_ERR, "Cannot ioctl TUNSETPERSIST(%d) %s", persist_mode, dev); +diff -ru openvpn-2.0.9~/tun.h openvpn-2.0.9/tun.h +--- openvpn-2.0.9~/tun.h 2008-05-13 23:21:30.000000000 +0200 ++++ openvpn-2.0.9/tun.h 2008-05-13 23:22:51.000000000 +0200 +@@ -194,7 +194,7 @@ + int read_tun (struct tuntap* tt, uint8_t *buf, int len); + + void tuncfg (const char *dev, const char *dev_type, const char *dev_node, +- bool ipv6, int persist_mode); ++ bool ipv6, int persist_mode, const struct tuntap_options *options); + + const char *guess_tuntap_dev (const char *dev, + const char *dev_type, |