Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/688?usp=email
to review the following change.
Change subject: Haiku: Add calls to manage routing table
......................................................................
Haiku: Add calls to manage routing table
Change-Id: I1a22724f28c5cd47f6df178b49f44087d7c2b6fd
---
M INSTALL
M src/openvpn/route.c
M src/openvpn/syshead.h
3 files changed, 125 insertions(+), 1 deletion(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/88/688/1
diff --git a/INSTALL b/INSTALL
index 6007338..e7199f8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -263,6 +263,13 @@
http://www.whiteboard.ne.jp/~admin2/tuntap/
+* Haiku:
+
+ Haiku can't yet dynamically create TUN/TAP devices, so you need to manually
+ create one before running openvpn:
+
+ # ifconfig tun/0 up
+
* Windows
OpenVPN on Windows needs a TUN/TAP kernel driver to work. OpenVPN installers
diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index 2e584c7..4813def 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -1853,7 +1853,23 @@
status = ret ? RTA_SUCCESS : RTA_ERROR;
}
-#else /* if defined(TARGET_LINUX) */
+#elif defined(TARGET_HAIKU)
+
+ {
+ /* ex: route add /dev/net/ipro1000/0 0.0.0.0 gw 192.168.1.1 netmask
128.0.0.0 */
+ argv_printf(&argv, "%s add %s inet %s gw %s netmask %s",
+ ROUTE_PATH,
+ rgi->iface,
+ network,
+ gateway,
+ netmask);
+ argv_msg(D_ROUTE, &argv);
+ bool ret = openvpn_execve_check(&argv, es, 0,
+ "ERROR: Haiku inet route add command
failed");
+ status = ret ? RTA_SUCCESS : RTA_ERROR;
+ }
+
+#else /* if defined(TARGET_LINUX) */
msg(M_FATAL, "Sorry, but I don't know how to do 'route' commands on this
operating system. Try putting your routes in a --route-up script");
#endif /* if defined(TARGET_LINUX) */
@@ -2329,6 +2345,20 @@
openvpn_execve_check(&argv, es, 0, "ERROR: AIX route delete command
failed");
}
+#elif defined(TARGET_HAIKU)
+
+ {
+ /* ex: route del /dev/net/ipro1000/0 inet 192.168.0.0 gw 192.168.1.1
netmask 255.255.0.0 */
+ argv_printf(&argv, "%s del %s inet %s gw %s netmask %s",
+ ROUTE_PATH,
+ rgi->iface,
+ network,
+ gateway,
+ netmask);
+ argv_msg(D_ROUTE, &argv);
+ openvpn_execve_check(&argv, es, 0, "ERROR: Haiku inet route delete
command failed");
+ }
+
#else /* if defined(TARGET_LINUX) */
msg(M_FATAL, "Sorry, but I don't know how to do 'route' commands on this
operating system. Try putting your routes in a --route-up script");
#endif /* if defined(TARGET_LINUX) */
@@ -2504,10 +2534,23 @@
network, r6->netbits, gateway);
argv_msg(D_ROUTE, &argv);
openvpn_execve_check(&argv, es, 0, "ERROR: AIX route add command failed");
+
#elif defined(TARGET_ANDROID)
msg(D_ROUTE_DEBUG, "Deleting routes on Android is not possible/not "
"needed. The VpnService API allows routes to be set "
"on connect only and will clean up automatically.");
+#elif defined(TARGET_HAIKU)
+ {
+ /* ex: route del /dev/net/ipro1000/0 inet6 :: gw beef::cafe
prefixlen 64 */
+ argv_printf(&argv, "%s del %s inet6 %s gw %s prefixlen %d",
+ ROUTE_PATH,
+ r6->iface,
+ network,
+ gateway,
+ r6->netbits);
+ argv_msg(D_ROUTE, &argv);
+ openvpn_execve_check(&argv, es, 0, "ERROR: Haiku inet6 route delete
command failed");
+ }
#else /* if defined(TARGET_LINUX) */
msg(M_FATAL, "Sorry, but I don't know how to do 'route ipv6' commands on
this operating system. Try putting your routes in a --route-down script");
#endif /* if defined(TARGET_LINUX) */
@@ -3886,6 +3929,74 @@
#undef max
+#elif defined(TARGET_HAIKU)
+
+void
+get_default_gateway(struct route_gateway_info *rgi, openvpn_net_ctx_t *ctx)
+{
+ CLEAR(*rgi);
+
+ int sockfd = -1;
+ sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+ if (sockfd < 0) {
+ msg(M_INFO, "%s: Error opening socket for AF_INET", __func__);
+ return;
+ }
+
+ struct ifconf config;
+ config.ifc_len = sizeof(config.ifc_value);
+ if (ioctl(sockfd, SIOCGRTSIZE, &config, sizeof(struct ifconf)) < 0) {
+ msg(M_INFO, "%s: Error getting routing table size", __func__);
+ return;
+ }
+
+ uint32 size = (uint32)config.ifc_value;
+ if (size == 0)
+ return;
+
+ void *buffer = malloc(size);
+ if (buffer == NULL) {
+ fprintf(stderr, "%s: Out of memory.\n", __func__);
+ return;
+ }
+
+ config.ifc_len = size;
+ config.ifc_buf = buffer;
+ if (ioctl(sockfd, SIOCGRTTABLE, &config, sizeof(struct ifconf)) < 0)
+ return;
+
+ struct ifreq *interface = (struct ifreq*)buffer;
+ struct ifreq *end = (struct ifreq*)((uint8*)buffer + size);
+
+ while (interface < end) {
+ struct route_entry route = interface->ifr_route;
+ if ((route.flags & RTF_GATEWAY) != 0 && (route.flags & RTF_DEFAULT) !=
0) {
+ rgi->gateway.addr = ntohl(((struct sockaddr_in
*)route.gateway)->sin_addr.s_addr);
+ rgi->flags = RGI_ADDR_DEFINED | RGI_IFACE_DEFINED;
+ strcpy(rgi->iface, interface->ifr_name);
+ }
+
+ int32 addressSize = 0;
+ if (route.destination != NULL)
+ addressSize += route.destination->sa_len;
+ if (route.mask != NULL)
+ addressSize += route.mask->sa_len;
+ if (route.gateway != NULL)
+ addressSize += route.gateway->sa_len;
+
+ interface = (struct ifreq*)((addr_t)interface + IF_NAMESIZE
+ + sizeof(struct route_entry) + addressSize);
+ }
+}
+
+void
+get_default_gateway_ipv6(struct route_ipv6_gateway_info *rgi6,
+ const struct in6_addr *dest, openvpn_net_ctx_t *ctx)
+{
+ /* TODO: Same for ipv6 with AF_INET6 */
+ CLEAR(*rgi6);
+}
+
#else /* if defined(_WIN32) */
/*
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index 33a90c1..844e47a 100644
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -166,6 +166,12 @@
#include <string.h>
#endif
+#if defined(TARGET_HAIKU)
+#include <SupportDefs.h> /* uint32, etc */
+#include <net/if.h> /* ifconf etc */
+#include <sys/sockio.h> /* SIOCGRTTABLE, etc */
+#endif /* TARGET_HAIKU */
+
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/688?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1a22724f28c5cd47f6df178b49f44087d7c2b6fd
Gerrit-Change-Number: 688
Gerrit-PatchSet: 1
Gerrit-Owner: kallisti5 <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
