Skip to content

quattor/functions/network get_subnet_params: allow to return subnet #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2024
+12 −3
Merged

quattor/functions/network get_subnet_params: allow to return subnet #237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions quattor/functions/network.pan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,15 +173,22 @@ function ip_in_network = {
by structure_interface + 'subnet' which is the subnet number (result of applying the\
mask to the address. `subnet` key is mandatory, 'netmask` defaults to 255.255.255.0.
arg = ip address to test
arg = boolean. When true, keep subnet parameter in return value. Default: false.
}
function get_subnet_params = {
if ( ARGC != 2 ) {
error("get_subnet_params requires 2 arguments");
if ( ARGC < 2 || ARGC > 3 ) {
error("get_subnet_params requires 2 or 3 arguments");
};

subnet_list = ARGV[0];
ipaddr = ARGV[1];

if ( ARGC == 3 ) {
keep_subnet = ARGV[2];
} else {
keep_subnet = false;
};

if ( !is_list(subnet_list) ) {
error("get_subnet_params first argument must be a list");
};
Expand Down Expand Up @@ -217,7 +224,9 @@ function get_subnet_params = {
};

if ( ip_in_network(ipaddr, params['subnet'], params['netmask']) ) {
delete(params["subnet"]); # Suppress subnet key
if (! keep_subnet) {
delete(params["subnet"]); # Suppress subnet key
};
return (params);
};
};
Expand Down
Loading