Skip to content

Commit

Permalink
Haiku: Add calls to manage routing table
Browse files Browse the repository at this point in the history 
Note: the full functionality of these changes depends on
      https://review.haiku-os.org/c/haiku/+/8592

Signed-off-by: Alexander von Gluck <[email protected]>
Acked-by: Gert Doering <[email protected]>
Change-Id: I1a22724f28c5cd47f6df178b49f44087d7c2b6fd
Message-Id: <[email protected]>
URL: https://www.mail-archive.com/[email protected]/msg30023.html
Signed-off-by: Gert Doering <[email protected]>
  • Loading branch information
@kallisti5 @cron2
kallisti5 authored and cron2 committed Dec 5, 2024
1 parent cb87888 commit 7da1492
Show file tree
Hide file tree
Showing 2 changed files with 140 additions and 1 deletion.
135 changes: 134 additions & 1 deletion src/openvpn/route.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1853,7 +1853,21 @@ add_route(struct route_ipv4 *r,
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) */

Expand Down Expand Up @@ -2126,6 +2140,20 @@ add_route_ipv6(struct route_ipv6 *r6, const struct tuntap *tt,
"ERROR: AIX route add command failed");
status = ret ? RTA_SUCCESS : RTA_ERROR;

#elif defined(TARGET_HAIKU)

/* ex: route add /dev/net/ipro1000/0 inet6 :: gw beef::cafe prefixlen 64 */
argv_printf(&argv, "%s add %s inet6 %s gw %s prefixlen %d",
ROUTE_PATH,
r6->iface,
network,
gateway,
r6->netbits);
argv_msg(D_ROUTE, &argv);
bool ret = openvpn_execve_check(&argv, es, 0,
"ERROR: Haiku inet6 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 ipv6' commands on this operating system. Try putting your routes in a --route-up script");
#endif /* if defined(TARGET_LINUX) */
Expand Down Expand Up @@ -2329,6 +2357,18 @@ delete_route(struct route_ipv4 *r,
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) */
Expand Down Expand Up @@ -2504,10 +2544,23 @@ delete_route_ipv6(const struct route_ipv6 *r6, const struct tuntap *tt,
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) */
Expand Down Expand Up @@ -3886,6 +3939,86 @@ get_default_gateway_ipv6(struct route_ipv6_gateway_info *rgi6,

#undef max

#elif defined(TARGET_HAIKU)

void
get_default_gateway(struct route_gateway_info *rgi, openvpn_net_ctx_t *ctx)
{
CLEAR(*rgi);

int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
if (sockfd < 0)
{
msg(M_ERRNO, "%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_ERRNO, "%s: Error getting routing table size", __func__);
return;
}

uint32 size = (uint32)config.ifc_value;
if (size == 0)
{
return;
}

void *buffer = malloc(size);
check_malloc_return(buffer);

config.ifc_len = size;
config.ifc_buf = buffer;
if (ioctl(sockfd, SIOCGRTTABLE, &config, sizeof(struct ifconf)) < 0)
{
free(buffer);
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;
strncpy(rgi->iface, interface->ifr_name, sizeof(rgi->iface));
}

int32 address_size = 0;
if (route.destination != NULL)
{
address_size += route.destination->sa_len;
}
if (route.mask != NULL)
{
address_size += route.mask->sa_len;
}
if (route.gateway != NULL)
{
address_size += route.gateway->sa_len;
}

interface = (struct ifreq *)((addr_t)interface + IF_NAMESIZE
+ sizeof(struct route_entry) + address_size);
}
free(buffer);
}

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) */

/*
Expand Down
6 changes: 6 additions & 0 deletions src/openvpn/syshead.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7da1492

Please sign in to comment.