feat: Allow specifying vmnet network UUID to disable DHCP #140
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,6 +48,12 @@ static void print_usage(const char *argv0) { | |
| "specified\n"); | ||
| printf("--vmnet-interface-id=UUID vmnet interface ID (default: " | ||
| "random)\n"); | ||
| printf("--vmnet-network-identifier=UUID vmnet network identifier (UUID string, \"random\", " | ||
| "or \"\")\n" | ||
| " When vmnet mode is \"host\" and --vmnet-gateway is " | ||
| "not set, the internal DHCP will be disabled.\n" | ||
| " (default: \"random\")\n"); | ||
|
There was a problem hiding this comment. default should be an empty string |
||
|
|
||
| printf("--vmnet-nat66-prefix=PREFIX:: The IPv6 prefix to use with " | ||
| "shared mode.\n"); | ||
| printf(" The prefix must be a ULA i.e. " | ||
|
|
@@ -72,6 +78,7 @@ enum { | |
| CLI_OPT_VMNET_MASK, | ||
| CLI_OPT_VMNET_INTERFACE_ID, | ||
| CLI_OPT_VMNET_NAT66_PREFIX, | ||
| CLI_OPT_VMNET_NETWORK_IDENTIFIER, | ||
| }; | ||
|
|
||
| struct cli_options *cli_options_parse(int argc, char *argv[]) { | ||
|
|
@@ -82,18 +89,19 @@ struct cli_options *cli_options_parse(int argc, char *argv[]) { | |
| } | ||
|
|
||
| const struct option longopts[] = { | ||
| {"socket-group", required_argument, NULL, CLI_OPT_SOCKET_GROUP }, | ||
| {"vmnet-mode", required_argument, NULL, CLI_OPT_VMNET_MODE }, | ||
| {"vmnet-interface", required_argument, NULL, CLI_OPT_VMNET_INTERFACE }, | ||
| {"vmnet-gateway", required_argument, NULL, CLI_OPT_VMNET_GATEWAY }, | ||
| {"vmnet-dhcp-end", required_argument, NULL, CLI_OPT_VMNET_DHCP_END }, | ||
| {"vmnet-mask", required_argument, NULL, CLI_OPT_VMNET_MASK }, | ||
| {"vmnet-interface-id", required_argument, NULL, CLI_OPT_VMNET_INTERFACE_ID }, | ||
| {"vmnet-nat66-prefix", required_argument, NULL, CLI_OPT_VMNET_NAT66_PREFIX }, | ||
| {"vmnet-network-identifier", required_argument, NULL, CLI_OPT_VMNET_NETWORK_IDENTIFIER}, | ||
| {"pidfile", required_argument, NULL, 'p' }, | ||
| {"help", no_argument, NULL, 'h' }, | ||
| {"version", no_argument, NULL, 'v' }, | ||
| {0, 0, 0, 0 }, | ||
| }; | ||
| int opt = 0; | ||
| while ((opt = getopt_long(argc, argv, "hvp:", longopts, NULL)) != -1) { | ||
|
|
@@ -134,6 +142,16 @@ struct cli_options *cli_options_parse(int argc, char *argv[]) { | |
| case CLI_OPT_VMNET_NAT66_PREFIX: | ||
| res->vmnet_nat66_prefix = strdup(optarg); | ||
| break; | ||
| case CLI_OPT_VMNET_NETWORK_IDENTIFIER: | ||
| if (strcmp(optarg, "random") == 0) { | ||
| uuid_generate_random(res->vmnet_network_identifier); | ||
| } else if (strcmp(optarg, "") == 0) { | ||
| uuid_clear(res->vmnet_network_identifier); | ||
| } else if (uuid_parse(optarg, res->vmnet_network_identifier) < 0) { | ||
| ERRORF("Failed to parse UUID \"%s\"", optarg); | ||
| goto error; | ||
| } | ||
| break; | ||
| case 'p': | ||
| res->pidfile = strdup(optarg); | ||
| break; | ||
|
|
@@ -191,7 +209,7 @@ struct cli_options *cli_options_parse(int argc, char *argv[]) { | |
| goto error; | ||
| } | ||
| if (res->vmnet_gateway == NULL) { | ||
| if (res->vmnet_mode != VMNET_BRIDGED_MODE && res->vmnet_mode != VMNET_HOST_MODE) { | ||
| WARN("--vmnet-gateway=IP should be explicitly specified to " | ||
| "avoid conflicting with other applications"); | ||
| } | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,8 @@ struct cli_options { | |
| char *vmnet_mask; | ||
| // --vmnet-interface-id, corresponds to vmnet_interface_id_key | ||
| uuid_t vmnet_interface_id; | ||
| // --vmnet-network-identifier, corresponds to vmnet_network_identifier_key | ||
| uuid_t vmnet_network_identifier; | ||
| // --vmnet-nat66-prefix, corresponds to vmnet_nat66_prefix_key | ||
| char *vmnet_nat66_prefix; | ||
| // -p, --pidfile; writes pidfile using permissions of socket_vmnet | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -230,10 +230,21 @@ static interface_ref start(struct state *state, struct cli_options *cliopt) { | |
| INFOF("Using network interface \"%s\"", cliopt->vmnet_interface); | ||
| xpc_dictionary_set_string(dict, vmnet_shared_interface_name_key, cliopt->vmnet_interface); | ||
| } | ||
|
|
||
| // no dhcp | ||
| if (cliopt->vmnet_mode == VMNET_HOST_MODE && cliopt->vmnet_gateway == NULL) { | ||
| if (!uuid_is_null(cliopt->vmnet_network_identifier)) { | ||
| xpc_dictionary_set_uuid(dict, vmnet_network_identifier_key, cliopt->vmnet_network_identifier); | ||
| uuid_string_t uuid_str; | ||
| uuid_unparse(cliopt->vmnet_network_identifier, uuid_str); | ||
| INFOF("Using network identifier \"%s\" and no vmnet gateway -> NO DHCP will be enabled on this vmnet", uuid_str); | ||
| } | ||
| } else { | ||
| if (cliopt->vmnet_gateway != NULL) { | ||
| xpc_dictionary_set_string(dict, vmnet_start_address_key, cliopt->vmnet_gateway); | ||
| xpc_dictionary_set_string(dict, vmnet_end_address_key, cliopt->vmnet_dhcp_end); | ||
| xpc_dictionary_set_string(dict, vmnet_subnet_mask_key, cliopt->vmnet_mask); | ||
| } | ||
| } | ||
|
|
||
| xpc_dictionary_set_uuid(dict, vmnet_interface_id_key, cliopt->vmnet_interface_id); | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
?