Skip to content

Commit 270e402

Browse files
authored
Merge pull request #860 from openziti/host.v1.nat
add address translations to host.v1
2 parents 45d498f + 98e171d commit 270e402

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

includes/ziti/ziti_model.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,18 @@ XX(http, __VA_ARGS__)
157157
XX(address, model_string, none, address, __VA_ARGS__) \
158158
XX(type, ziti_proxy_server_type, none, type, __VA_ARGS__)
159159

160+
#define ZITI_ADDRESS_TRANSLATION_MODEL(XX, ...) \
161+
XX(from, ziti_address, none, from, __VA_ARGS__) \
162+
XX(to, ziti_address, none, to, __VA_ARGS__) \
163+
XX(prefix_length, model_number, none, prefixLength, __VA_ARGS__ )
164+
160165
#define ZITI_HOST_CFG_V1_MODEL(XX, ...) \
161166
XX(protocol, model_string, none, protocol, __VA_ARGS__) \
162167
XX(forward_protocol, model_bool, none, forwardProtocol, __VA_ARGS__) \
163168
XX(allowed_protocols, model_string, array, allowedProtocols, __VA_ARGS__) \
164169
XX(address, model_string, none, address, __VA_ARGS__) \
165170
XX(forward_address, model_bool, none, forwardAddress, __VA_ARGS__) \
171+
XX(forward_address_translations, ziti_address_translation, array, forwardAddressTranslations, __VA_ARGS__) \
166172
XX(allowed_addresses, ziti_address, array, allowedAddresses, __VA_ARGS__) \
167173
XX(port, model_number, none, port, __VA_ARGS__) \
168174
XX(forward_port, model_bool, none, forwardPort, __VA_ARGS__) \
@@ -285,6 +291,8 @@ DECLARE_ENUM(ziti_proxy_server_type, ZITI_PROXY_SERVER_TYPE_ENUM)
285291

286292
DECLARE_MODEL(ziti_proxy_server, ZITI_PROXY_SERVER_MODEL)
287293

294+
DECLARE_MODEL(ziti_address_translation, ZITI_ADDRESS_TRANSLATION_MODEL)
295+
288296
DECLARE_MODEL(ziti_host_cfg_v1, ZITI_HOST_CFG_V1_MODEL)
289297

290298
DECLARE_MODEL(ziti_host_cfg_v2, ZITI_HOST_CFG_V2_MODEL)

library/internal_model.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ IMPL_ENUM(ziti_proxy_server_type, ZITI_PROXY_SERVER_TYPE_ENUM)
6767

6868
IMPL_MODEL(ziti_proxy_server, ZITI_PROXY_SERVER_MODEL)
6969

70+
IMPL_MODEL(ziti_address_translation, ZITI_ADDRESS_TRANSLATION_MODEL)
71+
7072
IMPL_MODEL(ziti_host_cfg_v1, ZITI_HOST_CFG_V1_MODEL)
7173

7274
IMPL_MODEL(ziti_host_cfg_v2, ZITI_HOST_CFG_V2_MODEL)

0 commit comments

Comments
 (0)