Skip to content

Commit 848bdaa

Browse files
romanmichalvasko
roman
authored and
michalvasko
committed
server config REFACTOR sort node names
Sort node names alphabetically for better readability
1 parent 4fbfe57 commit 848bdaa

File tree

1 file changed

+84
-89
lines changed

1 file changed

+84
-89
lines changed

‎src/server_config.c‎

Lines changed: 84 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -3849,119 +3849,114 @@ nc_server_config_parse_netconf_server(const struct lyd_node *node, NC_OPERATION
38493849
const char *name = LYD_NAME(node);
38503850
int ret = 0;
38513851

3852-
if (!strcmp(name, "listen")) {
3853-
ret = nc_server_config_listen(node, op);
3852+
if (!strcmp(name, "anchor-time")) {
3853+
ret = nc_server_config_anchor_time(node, op);
38543854
} else if (!strcmp(name, "call-home")) {
38553855
ret = nc_server_config_ch(node, op);
38563856
} else if (!strcmp(name, "endpoint")) {
38573857
ret = nc_server_config_endpoint(node, op);
3858+
} else if (!strcmp(name, "idle-timeout")) {
3859+
ret = nc_server_config_idle_timeout(node, op);
3860+
} else if (!strcmp(name, "listen")) {
3861+
ret = nc_server_config_listen(node, op);
3862+
} else if (!strcmp(name, "max-attempts")) {
3863+
ret = nc_server_config_max_attempts(node, op);
3864+
} else if (!strcmp(name, "max-wait")) {
3865+
ret = nc_server_config_max_wait(node, op);
3866+
} else if (!strcmp(name, "netconf-client")) {
3867+
ret = nc_server_config_netconf_client(node, op);
3868+
} else if (!strcmp(name, "period")) {
3869+
ret = nc_server_config_period(node, op);
3870+
} else if (!strcmp(name, "periodic")) {
3871+
ret = nc_server_config_periodic(node, op);
3872+
} else if (!strcmp(name, "persistent")) {
3873+
ret = nc_server_config_persistent(node, op);
3874+
} else if (!strcmp(name, "reconnect-strategy")) {
3875+
ret = nc_server_config_reconnect_strategy(node, op);
3876+
} else if (!strcmp(name, "start-with")) {
3877+
ret = nc_server_config_start_with(node, op);
38583878
}
38593879
#ifdef NC_ENABLED_SSH_TLS
3860-
else if (!strcmp(name, "ssh")) {
3861-
ret = nc_server_config_ssh(node, op);
3880+
else if (!strcmp(name, "auth-timeout")) {
3881+
ret = nc_server_config_auth_timeout(node, op);
3882+
} else if (!strcmp(name, "asymmetric-key")) {
3883+
ret = nc_server_config_asymmetric_key(node, op);
3884+
} else if (!strcmp(name, "ca-certs")) {
3885+
ret = nc_server_config_ca_certs(node, op);
3886+
} else if (!strcmp(name, "central-keystore-reference")) {
3887+
ret = nc_server_config_keystore_reference(node, op);
3888+
} else if (!strcmp(name, "central-truststore-reference")) {
3889+
ret = nc_server_config_truststore_reference(node, op);
3890+
} else if (!strcmp(name, "cert-data")) {
3891+
ret = nc_server_config_cert_data(node, op);
3892+
} else if (!strcmp(name, "certificate")) {
3893+
ret = nc_server_config_certificate(node, op);
3894+
} else if (!strcmp(name, "cert-to-name")) {
3895+
ret = nc_server_config_cert_to_name(node, op);
3896+
} else if (!strcmp(name, "cipher-suite")) {
3897+
ret = nc_server_config_cipher_suite(node, op);
3898+
} else if (!strcmp(name, "cleartext-private-key")) {
3899+
ret = nc_server_config_cleartext_private_key(node, op);
3900+
} else if (!strcmp(name, "client-authentication")) {
3901+
ret = nc_server_config_client_authentication(node, op);
3902+
} else if (!strcmp(name, "ee-certs")) {
3903+
ret = nc_server_config_ee_certs(node, op);
3904+
} else if (!strcmp(name, "encryption-alg")) {
3905+
ret = nc_server_config_encryption_alg(node, op);
3906+
} else if (!strcmp(name, "endpoint-reference")) {
3907+
ret = nc_server_config_endpoint_reference(node, op);
3908+
} else if (!strcmp(name, "fingerprint")) {
3909+
ret = nc_server_config_fingerprint(node, op);
3910+
} else if (!strcmp(name, "host-key")) {
3911+
ret = nc_server_config_host_key(node, op);
3912+
} else if (!strcmp(name, "host-key-alg")) {
3913+
ret = nc_server_config_host_key_alg(node, op);
3914+
} else if (!strcmp(name, "idle-time")) {
3915+
ret = nc_server_config_idle_time(node, op);
3916+
} else if (!strcmp(name, "keepalives")) {
3917+
ret = nc_server_config_keepalives(node, op);
3918+
} else if (!strcmp(name, "key-exchange-alg")) {
3919+
ret = nc_server_config_kex_alg(node, op);
38623920
} else if (!strcmp(name, "local-address")) {
38633921
ret = nc_server_config_local_address(node, op);
38643922
} else if (!strcmp(name, "local-port")) {
38653923
ret = nc_server_config_local_port(node, op);
3866-
} else if (!strcmp(name, "keepalives")) {
3867-
ret = nc_server_config_keepalives(node, op);
3868-
} else if (!strcmp(name, "idle-time")) {
3869-
ret = nc_server_config_idle_time(node, op);
3924+
} else if (!strcmp(name, "mac-alg")) {
3925+
ret = nc_server_config_mac_alg(node, op);
38703926
} else if (!strcmp(name, "max-probes")) {
38713927
ret = nc_server_config_max_probes(node, op);
3928+
} else if (!strcmp(name, "none")) {
3929+
ret = nc_server_config_none(node, op);
3930+
} else if (!strcmp(name, "password")) {
3931+
ret = nc_server_config_password(node, op);
3932+
} else if (!strcmp(name, "private-key-format")) {
3933+
ret = nc_server_config_private_key_format(node, op);
38723934
} else if (!strcmp(name, "probe-interval")) {
38733935
ret = nc_server_config_probe_interval(node, op);
3874-
} else if (!strcmp(name, "host-key")) {
3875-
ret = nc_server_config_host_key(node, op);
3876-
} else if (!strcmp(name, "public-key-format")) {
3877-
ret = nc_server_config_public_key_format(node, op);
38783936
} else if (!strcmp(name, "public-key")) {
38793937
ret = nc_server_config_public_key(node, op);
3880-
} else if (!strcmp(name, "private-key-format")) {
3881-
ret = nc_server_config_private_key_format(node, op);
3882-
} else if (!strcmp(name, "cleartext-private-key")) {
3883-
ret = nc_server_config_cleartext_private_key(node, op);
3884-
} else if (!strcmp(name, "central-keystore-reference")) {
3885-
ret = nc_server_config_keystore_reference(node, op);
3886-
} else if (!strcmp(name, "user")) {
3887-
ret = nc_server_config_user(node, op);
3888-
} else if (!strcmp(name, "auth-timeout")) {
3889-
ret = nc_server_config_auth_timeout(node, op);
3890-
} else if (!strcmp(name, "central-truststore-reference")) {
3891-
ret = nc_server_config_truststore_reference(node, op);
3892-
} else if (!strcmp(name, "use-system-keys")) {
3893-
ret = nc_server_config_use_system_keys(node, op);
3938+
} else if (!strcmp(name, "public-key-format")) {
3939+
ret = nc_server_config_public_key_format(node, op);
38943940
} else if (!strcmp(name, "public-keys")) {
38953941
ret = nc_server_config_public_keys(node, op);
3896-
} else if (!strcmp(name, "password")) {
3897-
ret = nc_server_config_password(node, op);
3898-
} else if (!strcmp(name, "use-system-auth")) {
3899-
ret = nc_server_config_use_system_auth(node, op);
3900-
} else if (!strcmp(name, "none")) {
3901-
ret = nc_server_config_none(node, op);
3902-
} else if (!strcmp(name, "host-key-alg")) {
3903-
ret = nc_server_config_host_key_alg(node, op);
3904-
} else if (!strcmp(name, "key-exchange-alg")) {
3905-
ret = nc_server_config_kex_alg(node, op);
3906-
} else if (!strcmp(name, "encryption-alg")) {
3907-
ret = nc_server_config_encryption_alg(node, op);
3908-
} else if (!strcmp(name, "mac-alg")) {
3909-
ret = nc_server_config_mac_alg(node, op);
3910-
} else if (!strcmp(name, "endpoint-reference")) {
3911-
ret = nc_server_config_endpoint_reference(node, op);
3942+
} else if (!strcmp(name, "remote-address")) {
3943+
ret = nc_server_config_remote_address(node, op);
3944+
} else if (!strcmp(name, "remote-port")) {
3945+
ret = nc_server_config_remote_port(node, op);
3946+
} else if (!strcmp(name, "ssh")) {
3947+
ret = nc_server_config_ssh(node, op);
39123948
} else if (!strcmp(name, "tls")) {
39133949
ret = nc_server_config_tls(node, op);
3914-
} else if (!strcmp(name, "cert-data")) {
3915-
ret = nc_server_config_cert_data(node, op);
3916-
} else if (!strcmp(name, "asymmetric-key")) {
3917-
ret = nc_server_config_asymmetric_key(node, op);
3918-
} else if (!strcmp(name, "client-authentication")) {
3919-
ret = nc_server_config_client_authentication(node, op);
3920-
} else if (!strcmp(name, "ca-certs")) {
3921-
ret = nc_server_config_ca_certs(node, op);
3922-
} else if (!strcmp(name, "ee-certs")) {
3923-
ret = nc_server_config_ee_certs(node, op);
3924-
} else if (!strcmp(name, "certificate")) {
3925-
ret = nc_server_config_certificate(node, op);
3926-
} else if (!strcmp(name, "cert-to-name")) {
3927-
ret = nc_server_config_cert_to_name(node, op);
3928-
} else if (!strcmp(name, "fingerprint")) {
3929-
ret = nc_server_config_fingerprint(node, op);
39303950
} else if (!strcmp(name, "tls-version")) {
39313951
ret = nc_server_config_tls_version(node, op);
3932-
} else if (!strcmp(name, "cipher-suite")) {
3933-
ret = nc_server_config_cipher_suite(node, op);
3934-
}
3935-
#endif /* NC_ENABLED_SSH_TLS */
3936-
else if (!strcmp(name, "netconf-client")) {
3937-
ret = nc_server_config_netconf_client(node, op);
3938-
}
3939-
#ifdef NC_ENABLED_SSH_TLS
3940-
else if (!strcmp(name, "remote-address")) {
3941-
ret = nc_server_config_remote_address(node, op);
3942-
} else if (!strcmp(name, "remote-port")) {
3943-
ret = nc_server_config_remote_port(node, op);
3952+
} else if (!strcmp(name, "user")) {
3953+
ret = nc_server_config_user(node, op);
3954+
} else if (!strcmp(name, "use-system-auth")) {
3955+
ret = nc_server_config_use_system_auth(node, op);
3956+
} else if (!strcmp(name, "use-system-keys")) {
3957+
ret = nc_server_config_use_system_keys(node, op);
39443958
}
39453959
#endif /* NC_ENABLED_SSH_TLS */
3946-
else if (!strcmp(name, "persistent")) {
3947-
ret = nc_server_config_persistent(node, op);
3948-
} else if (!strcmp(name, "periodic")) {
3949-
ret = nc_server_config_periodic(node, op);
3950-
} else if (!strcmp(name, "period")) {
3951-
ret = nc_server_config_period(node, op);
3952-
} else if (!strcmp(name, "anchor-time")) {
3953-
ret = nc_server_config_anchor_time(node, op);
3954-
} else if (!strcmp(name, "idle-timeout")) {
3955-
ret = nc_server_config_idle_timeout(node, op);
3956-
} else if (!strcmp(name, "reconnect-strategy")) {
3957-
ret = nc_server_config_reconnect_strategy(node, op);
3958-
} else if (!strcmp(name, "start-with")) {
3959-
ret = nc_server_config_start_with(node, op);
3960-
} else if (!strcmp(name, "max-wait")) {
3961-
ret = nc_server_config_max_wait(node, op);
3962-
} else if (!strcmp(name, "max-attempts")) {
3963-
ret = nc_server_config_max_attempts(node, op);
3964-
}
39653960

39663961
if (ret) {
39673962
ERR(NULL, "Configuring node \"%s\" failed.", LYD_NAME(node));

0 commit comments

Comments
 (0)