GNOME.org
 

[network-manager-openvpn/th/extra-certs-and-cleanup: 2/13] all: asciibetically sort property list and defines

commit 1ea6322c16b23c80ea1703e69f157018d490dc40
Author: Thomas Haller <thaller redhat com>
Date:   Thu Feb 22 18:53:09 2018 +0100

    all: asciibetically sort property list and defines
    
    Reordering #define has no visible effect.
    
    Reordering the properties like in @advanced_keys has effects in
    the order in which we find keys. Optimally we would have frequently
    used keys as first. But in reality, if the order of the search list
    matters performance we, we should instead use a lookup table. So,
    asciibetically sort oder is suitable also here and looks consistent
    in source code.

 properties/import-export.c     |    2 +-
 properties/nm-openvpn-editor.c |   48 ++++++++++++++++++++--------------------
 shared/nm-service-defines.h    |   40 ++++++++++++++++----------------
 shared/utils.h                 |    8 +++---
 4 files changed, 49 insertions(+), 49 deletions(-)
---
diff --git a/properties/import-export.c b/properties/import-export.c
index 04e2d68..02d4f86 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -1188,10 +1188,10 @@ do_import (const char *path, const char *contents, gsize contents_len, GError **
                }
 
                if (NM_IN_STRSET (params[0],
-                                 NMV_OVPN_TAG_PKCS12,
                                  NMV_OVPN_TAG_CA,
                                  NMV_OVPN_TAG_CERT,
                                  NMV_OVPN_TAG_KEY,
+                                 NMV_OVPN_TAG_PKCS12,
                                  NMV_OVPN_TAG_SECRET,
                                  NMV_OVPN_TAG_TLS_AUTH,
                                  NMV_OVPN_TAG_TLS_CRYPT)) {
diff --git a/properties/nm-openvpn-editor.c b/properties/nm-openvpn-editor.c
index d5c83dd..8d6ff1f 100644
--- a/properties/nm-openvpn-editor.c
+++ b/properties/nm-openvpn-editor.c
@@ -682,40 +682,40 @@ sk_file_chooser_filter_new (void)
 }
 
 static const char *advanced_keys[] = {
-       NM_OPENVPN_KEY_PORT,
+       NM_OPENVPN_KEY_AUTH,
+       NM_OPENVPN_KEY_CIPHER,
        NM_OPENVPN_KEY_COMP_LZO,
-       NM_OPENVPN_KEY_MSSFIX,
-       NM_OPENVPN_KEY_FLOAT,
-       NM_OPENVPN_KEY_TUNNEL_MTU,
-       NM_OPENVPN_KEY_FRAGMENT_SIZE,
-       NM_OPENVPN_KEY_TAP_DEV,
+       NM_OPENVPN_KEY_CONNECT_TIMEOUT,
        NM_OPENVPN_KEY_DEV,
        NM_OPENVPN_KEY_DEV_TYPE,
+       NM_OPENVPN_KEY_FLOAT,
+       NM_OPENVPN_KEY_FRAGMENT_SIZE,
+       NM_OPENVPN_KEY_HTTP_PROXY_USERNAME,
+       NM_OPENVPN_KEY_KEYSIZE,
+       NM_OPENVPN_KEY_MAX_ROUTES,
+       NM_OPENVPN_KEY_MSSFIX,
+       NM_OPENVPN_KEY_MTU_DISC,
+       NM_OPENVPN_KEY_NS_CERT_TYPE,
+       NM_OPENVPN_KEY_PING,
+       NM_OPENVPN_KEY_PING_EXIT,
+       NM_OPENVPN_KEY_PING_RESTART,
+       NM_OPENVPN_KEY_PORT,
        NM_OPENVPN_KEY_PROTO_TCP,
-       NM_OPENVPN_KEY_PROXY_TYPE,
-       NM_OPENVPN_KEY_PROXY_SERVER,
        NM_OPENVPN_KEY_PROXY_PORT,
        NM_OPENVPN_KEY_PROXY_RETRY,
-       NM_OPENVPN_KEY_HTTP_PROXY_USERNAME,
-       NM_OPENVPN_KEY_CIPHER,
-       NM_OPENVPN_KEY_KEYSIZE,
-       NM_OPENVPN_KEY_AUTH,
-       NM_OPENVPN_KEY_TA_DIR,
+       NM_OPENVPN_KEY_PROXY_SERVER,
+       NM_OPENVPN_KEY_PROXY_TYPE,
+       NM_OPENVPN_KEY_REMOTE_CERT_TLS,
+       NM_OPENVPN_KEY_REMOTE_RANDOM,
+       NM_OPENVPN_KEY_RENEG_SECONDS,
        NM_OPENVPN_KEY_TA,
+       NM_OPENVPN_KEY_TAP_DEV,
+       NM_OPENVPN_KEY_TA_DIR,
        NM_OPENVPN_KEY_TLS_CRYPT,
-       NM_OPENVPN_KEY_RENEG_SECONDS,
        NM_OPENVPN_KEY_TLS_REMOTE,
-       NM_OPENVPN_KEY_VERIFY_X509_NAME,
-       NM_OPENVPN_KEY_REMOTE_RANDOM,
+       NM_OPENVPN_KEY_TUNNEL_MTU,
        NM_OPENVPN_KEY_TUN_IPV6,
-       NM_OPENVPN_KEY_REMOTE_CERT_TLS,
-       NM_OPENVPN_KEY_NS_CERT_TYPE,
-       NM_OPENVPN_KEY_PING,
-       NM_OPENVPN_KEY_PING_EXIT,
-       NM_OPENVPN_KEY_PING_RESTART,
-       NM_OPENVPN_KEY_MAX_ROUTES,
-       NM_OPENVPN_KEY_MTU_DISC,
-       NM_OPENVPN_KEY_CONNECT_TIMEOUT,
+       NM_OPENVPN_KEY_VERIFY_X509_NAME,
        NULL
 };
 
diff --git a/shared/nm-service-defines.h b/shared/nm-service-defines.h
index 4790a3a..6ce6767 100644
--- a/shared/nm-service-defines.h
+++ b/shared/nm-service-defines.h
@@ -32,13 +32,18 @@
 #define NM_OPENVPN_KEY_CA "ca"
 #define NM_OPENVPN_KEY_CERT "cert"
 #define NM_OPENVPN_KEY_CIPHER "cipher"
-#define NM_OPENVPN_KEY_KEYSIZE "keysize"
 #define NM_OPENVPN_KEY_COMP_LZO "comp-lzo"
 #define NM_OPENVPN_KEY_CONNECTION_TYPE "connection-type"
+#define NM_OPENVPN_KEY_CONNECT_TIMEOUT "connect-timeout"
+#define NM_OPENVPN_KEY_DEV "dev"
+#define NM_OPENVPN_KEY_DEV_TYPE "dev-type"
 #define NM_OPENVPN_KEY_FLOAT "float"
 #define NM_OPENVPN_KEY_FRAGMENT_SIZE "fragment-size"
+#define NM_OPENVPN_KEY_HTTP_PROXY_USERNAME "http-proxy-username"
 #define NM_OPENVPN_KEY_KEY "key"
+#define NM_OPENVPN_KEY_KEYSIZE "keysize"
 #define NM_OPENVPN_KEY_LOCAL_IP "local-ip" /* ??? */
+#define NM_OPENVPN_KEY_MAX_ROUTES "max-routes"
 #define NM_OPENVPN_KEY_MSSFIX "mssfix"
 #define NM_OPENVPN_KEY_MTU_DISC "mtu-disc"
 #define NM_OPENVPN_KEY_NS_CERT_TYPE "ns-cert-type"
@@ -47,31 +52,27 @@
 #define NM_OPENVPN_KEY_PING_RESTART "ping-restart"
 #define NM_OPENVPN_KEY_PORT "port"
 #define NM_OPENVPN_KEY_PROTO_TCP "proto-tcp"
-#define NM_OPENVPN_KEY_PROXY_TYPE "proxy-type"
-#define NM_OPENVPN_KEY_PROXY_SERVER "proxy-server"
 #define NM_OPENVPN_KEY_PROXY_PORT "proxy-port"
 #define NM_OPENVPN_KEY_PROXY_RETRY "proxy-retry"
-#define NM_OPENVPN_KEY_HTTP_PROXY_USERNAME "http-proxy-username"
+#define NM_OPENVPN_KEY_PROXY_SERVER "proxy-server"
+#define NM_OPENVPN_KEY_PROXY_TYPE "proxy-type"
 #define NM_OPENVPN_KEY_REMOTE "remote"
-#define NM_OPENVPN_KEY_REMOTE_RANDOM "remote-random"
+#define NM_OPENVPN_KEY_REMOTE_CERT_TLS "remote-cert-tls"
 #define NM_OPENVPN_KEY_REMOTE_IP "remote-ip"
+#define NM_OPENVPN_KEY_REMOTE_RANDOM "remote-random"
+#define NM_OPENVPN_KEY_RENEG_SECONDS "reneg-seconds"
 #define NM_OPENVPN_KEY_STATIC_KEY "static-key"
 #define NM_OPENVPN_KEY_STATIC_KEY_DIRECTION "static-key-direction"
 #define NM_OPENVPN_KEY_TA "ta"
-#define NM_OPENVPN_KEY_TA_DIR "ta-dir"
-#define NM_OPENVPN_KEY_TUNNEL_MTU "tunnel-mtu"
-#define NM_OPENVPN_KEY_USERNAME "username"
 #define NM_OPENVPN_KEY_TAP_DEV "tap-dev"
-#define NM_OPENVPN_KEY_DEV "dev"
-#define NM_OPENVPN_KEY_DEV_TYPE "dev-type"
-#define NM_OPENVPN_KEY_TUN_IPV6 "tun-ipv6"
+#define NM_OPENVPN_KEY_TA_DIR "ta-dir"
 #define NM_OPENVPN_KEY_TLS_CIPHER "tls-cipher"
 #define NM_OPENVPN_KEY_TLS_CRYPT "tls-crypt"
 #define NM_OPENVPN_KEY_TLS_REMOTE "tls-remote"
+#define NM_OPENVPN_KEY_TUNNEL_MTU "tunnel-mtu"
+#define NM_OPENVPN_KEY_TUN_IPV6 "tun-ipv6"
+#define NM_OPENVPN_KEY_USERNAME "username"
 #define NM_OPENVPN_KEY_VERIFY_X509_NAME "verify-x509-name"
-#define NM_OPENVPN_KEY_REMOTE_CERT_TLS "remote-cert-tls"
-#define NM_OPENVPN_KEY_MAX_ROUTES "max-routes"
-#define NM_OPENVPN_KEY_CONNECT_TIMEOUT "connect-timeout"
 
 #define NM_OPENVPN_KEY_PASSWORD "password"
 #define NM_OPENVPN_KEY_CERTPASS "cert-pass"
@@ -81,22 +82,21 @@
  */
 #define NM_OPENVPN_KEY_NOSECRET "no-secret"
 
-#define NM_OPENVPN_KEY_RENEG_SECONDS "reneg-seconds"
 
+#define NM_OPENVPN_AUTH_MD5  "MD5"
 #define NM_OPENVPN_AUTH_NONE "none"
+#define NM_OPENVPN_AUTH_RIPEMD160 "RIPEMD160"
 #define NM_OPENVPN_AUTH_RSA_MD4 "RSA-MD4"
-#define NM_OPENVPN_AUTH_MD5  "MD5"
 #define NM_OPENVPN_AUTH_SHA1 "SHA1"
 #define NM_OPENVPN_AUTH_SHA224 "SHA224"
 #define NM_OPENVPN_AUTH_SHA256 "SHA256"
 #define NM_OPENVPN_AUTH_SHA384 "SHA384"
 #define NM_OPENVPN_AUTH_SHA512 "SHA512"
-#define NM_OPENVPN_AUTH_RIPEMD160 "RIPEMD160"
 
-#define NM_OPENVPN_CONTYPE_TLS          "tls"
-#define NM_OPENVPN_CONTYPE_STATIC_KEY   "static-key"
 #define NM_OPENVPN_CONTYPE_PASSWORD     "password"
 #define NM_OPENVPN_CONTYPE_PASSWORD_TLS "password-tls"
+#define NM_OPENVPN_CONTYPE_STATIC_KEY   "static-key"
+#define NM_OPENVPN_CONTYPE_TLS          "tls"
 
 /* arguments of "--remote-cert-tls" */
 #define NM_OPENVPN_REM_CERT_TLS_CLIENT "client"
@@ -107,9 +107,9 @@
 #define NM_OPENVPN_NS_CERT_TYPE_SERVER "server"
 
 /* possible types for verify-x509-name */
-#define NM_OPENVPN_VERIFY_X509_NAME_TYPE_SUBJECT     "subject"
 #define NM_OPENVPN_VERIFY_X509_NAME_TYPE_NAME        "name"
 #define NM_OPENVPN_VERIFY_X509_NAME_TYPE_NAME_PREFIX "name-prefix"
+#define NM_OPENVPN_VERIFY_X509_NAME_TYPE_SUBJECT     "subject"
 
 /* User name and group to run nm-openvpn-service under */
 #define NM_OPENVPN_USER   "nm-openvpn"
diff --git a/shared/utils.h b/shared/utils.h
index d70436e..7e41ac1 100644
--- a/shared/utils.h
+++ b/shared/utils.h
@@ -40,9 +40,9 @@
 #define NMV_OVPN_TAG_HTTP_PROXY_RETRY   "http-proxy-retry"
 #define NMV_OVPN_TAG_IFCONFIG           "ifconfig"
 #define NMV_OVPN_TAG_KEEPALIVE          "keepalive"
-#define NMV_OVPN_TAG_KEY_DIRECTION      "key-direction"
 #define NMV_OVPN_TAG_KEY                "key"
 #define NMV_OVPN_TAG_KEYSIZE            "keysize"
+#define NMV_OVPN_TAG_KEY_DIRECTION      "key-direction"
 #define NMV_OVPN_TAG_MAX_ROUTES         "max-routes"
 #define NMV_OVPN_TAG_MSSFIX             "mssfix"
 #define NMV_OVPN_TAG_MTU_DISC           "mtu-disc"
@@ -50,23 +50,23 @@
 #define NMV_OVPN_TAG_NS_CERT_TYPE       "ns-cert-type"
 #define NMV_OVPN_TAG_PERSIST_KEY        "persist-key"
 #define NMV_OVPN_TAG_PERSIST_TUN        "persist-tun"
-#define NMV_OVPN_TAG_PING_EXIT          "ping-exit"
 #define NMV_OVPN_TAG_PING               "ping"
+#define NMV_OVPN_TAG_PING_EXIT          "ping-exit"
 #define NMV_OVPN_TAG_PING_RESTART       "ping-restart"
 #define NMV_OVPN_TAG_PKCS12             "pkcs12"
 #define NMV_OVPN_TAG_PORT               "port"
 #define NMV_OVPN_TAG_PROTO              "proto"
+#define NMV_OVPN_TAG_REMOTE             "remote"
 #define NMV_OVPN_TAG_REMOTE_CERT_TLS    "remote-cert-tls"
 #define NMV_OVPN_TAG_REMOTE_RANDOM      "remote-random"
-#define NMV_OVPN_TAG_REMOTE             "remote"
 #define NMV_OVPN_TAG_RENEG_SEC          "reneg-sec"
 #define NMV_OVPN_TAG_ROUTE              "route"
 #define NMV_OVPN_TAG_RPORT              "rport"
 #define NMV_OVPN_TAG_SCRIPT_SECURITY    "script-security"
 #define NMV_OVPN_TAG_SECRET             "secret"
 #define NMV_OVPN_TAG_SERVER_POLL_TIMEOUT "server-poll-timeout"
-#define NMV_OVPN_TAG_SOCKS_PROXY_RETRY  "socks-proxy-retry"
 #define NMV_OVPN_TAG_SOCKS_PROXY        "socks-proxy"
+#define NMV_OVPN_TAG_SOCKS_PROXY_RETRY  "socks-proxy-retry"
 #define NMV_OVPN_TAG_TLS_AUTH           "tls-auth"
 #define NMV_OVPN_TAG_TLS_CIPHER         "tls-cipher"
 #define NMV_OVPN_TAG_TLS_CLIENT         "tls-client"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]