From 0f17077b3d592d5c39374cf44fe5ea1173d7109c Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 6 May 2016 10:57:53 -0700 Subject: Merge gateways and routes in netconf since they are the same thing. --- include/ZeroTierOne.h | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index 465fd892..6f0517ba 100644 --- a/include/ZeroTierOne.h +++ b/include/ZeroTierOne.h @@ -82,20 +82,15 @@ extern "C" { #define ZT_MAX_NETWORK_SHORT_NAME_LENGTH 127 /** - * Maximum number of local routes on a network + * Maximum number of pushed routes on a network */ -#define ZT_MAX_NETWORK_LOCAL_ROUTES 16 +#define ZT_MAX_NETWORK_ROUTES 32 /** * Maximum number of statically assigned IP addresses per network endpoint using ZT address management (not DHCP) */ #define ZT_MAX_ZT_ASSIGNED_ADDRESSES 16 -/** - * Maximum number of default routes / gateways on a network (ZT managed) - */ -#define ZT_MAX_NETWORK_GATEWAYS 8 - /** * Maximum number of "specialists" on a network -- bridges, relays, etc. */ @@ -619,6 +614,22 @@ typedef struct } v; } ZT_VirtualNetworkRule; +/** + * A route to be pushed on a virtual network + */ +typedef struct +{ + /** + * Target network / netmask bits (in port field) or NULL or 0.0.0.0/0 for default + */ + struct sockaddr_storage target; + + /** + * Gateway IP address (port ignored) or NULL (family == 0) for LAN-local (no gateway) + */ + struct sockaddr_storage via; +} ZT_VirtualNetworkRoute; + /** * An Ethernet multicast group */ -- cgit v1.2.3