Rc add zfw calls 1.3.x #1054
Merged
Rc add zfw calls 1.3.x #1054
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
scareything
force-pushed
the
rc-add-zfw-calls-main-2
branch
from
61119a2 to
5b99de0
Compare
ekoby
reviewed
Dec 10, 2024
ekoby
reviewed
Dec 10, 2024
| @@ -78,6 +79,28 @@ static bool is_host_only(); | |||
| static void run_tunneler_loop(uv_loop_t* ziti_loop); | |||
| static tunneler_context initialize_tunneler(netif_driver tun, uv_loop_t* ziti_loop); | |||
|
|
|||
| #if __linux__ | |||
| static void diverter_quit(); | |||
There was a problem hiding this comment.
we should make these into diverter interface
ekoby
reviewed
Dec 10, 2024
| char *diverter_env_path = getenv("ZFW_OBJECT_PATH"); | ||
| if(diverter_env_path && strlen(diverter_env_path)){ | ||
| diverter_path = diverter_env_path; | ||
| sprintf(zfw_path, "%s/%s", diverter_env_path, "zfw"); |
ekoby
reviewed
Dec 10, 2024
| static void diverter_update(const char *ip, uint8_t prefix_len, uint16_t lowport, uint16_t highport, const char *protocol, const char *service_id, const char *action) { | ||
| int rndm; | ||
| uv_random(NULL, NULL, &rndm, sizeof(rndm), 0, NULL); | ||
| unsigned short random_port = 1024 + rndm % (65535 - 1023); |
There was a problem hiding this comment.
for zfw in tunnel mode it just cant be set to 0. A setting of 0 indicates that a matching packet should be passed to the OS and not to directly forwarded to the ziti0 interface. As long as it between 1 and 65535 it does not matter if it is in use. We could make it any static value between 1 and 65535 and remove the uv_random call. On ziti-router in tproxy mode it would matter that it was specific to the tproxy port configured for the service.
scareything
force-pushed
the
rc-add-zfw-calls-main-2
branch
2 times, most recently
from
fea9b96 to
df94a2a
Compare
scareything
force-pushed
the
rc-add-zfw-calls-main-2
branch
from
df94a2a to
d363b83
Compare
ekoby
reviewed
Jan 3, 2025
| } | ||
| } | ||
| } | ||
| else if(svc->Permissions.Bind){ |
There was a problem hiding this comment.
should this be else? Both permissions could be set
ekoby
approved these changes
Jan 3, 2025
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
changes from #1000 applied to main instead of release-1.x