hndl migration

Signed-off-by: Salil Chandra <[email protected]>

Author: chands10

cdb2api/cdb2api.c

@@ -1564,7 +1564,7 @@ static void read_comdb2db_cfg(cdb2_hndl_tp *hndl, SBUF2 *s, const char *comdb2db
                 tok = strtok_r(NULL, " :,", &last);
                 if (tok) {
                     if (hndl && (strcasecmp(hndl->cluster, "default") == 0)) {
-                        strncpy(hndl->cluster, tok, sizeof(cdb2_default_cluster) - 1);
+                        strncpy(hndl->cluster, tok, sizeof(hndl->cluster) - 1);
                     } else if (!hndl) {
                         strncpy(cdb2_default_cluster, tok, sizeof(cdb2_default_cluster) - 1);
                     }
@@ -6628,7 +6628,7 @@ static int comdb2db_get_dbhosts(cdb2_hndl_tp *hndl, const char *comdb2db_name, i
     bindvars[0] = bind_dbname;
     bindvars[1] = bind_cluster;
     bindvars[2] = bind_room;
-    char newsql_typestr[128];
+    char newsql_typestr[TYPESTR_LEN];
     int is_sockfd = 1;
     int i = 0;
 
@@ -6831,7 +6831,7 @@ static int cdb2_dbinfo_query(cdb2_hndl_tp *hndl, const char *type, const char *d
                              char valid_hosts[][CDB2HOSTNAME_LEN], int *valid_ports, int *master_node,
                              int *num_valid_hosts, int *num_valid_sameroom_hosts)
 {
-    char newsql_typestr[128];
+    char newsql_typestr[TYPESTR_LEN];
     SBUF2 *sb = NULL;
     int fd = -1;
     int rc = 0; /* Make compilers happy. */

cdb2api/cdb2api_hndl.h

@@ -26,13 +26,13 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 
-#define MAX_NODES 128
+#define MAX_NODES 48
 
-#define DBNAME_LEN 64
-#define TYPE_LEN 64
+#define DBNAME_LEN 32
+#define TYPE_LEN 32
 #define POLICY_LEN 24
 
-#define CDB2HOSTNAME_LEN 128
+#define CDB2HOSTNAME_LEN 64
 
 #define MAX_STACK 512 /* Size of call-stack which opened the handle */
 
@@ -111,7 +111,7 @@ typedef struct cdb2_ssl_sess cdb2_ssl_sess;
 
 struct cdb2_hndl {
     char dbname[DBNAME_LEN];
-    char cluster[64];
+    char cluster[32];
     char type[TYPE_LEN];
     char hosts[MAX_NODES][CDB2HOSTNAME_LEN];
     uint64_t timestampus; // client query timestamp of first try
@@ -121,6 +121,9 @@ struct cdb2_hndl {
     char cached_host[CDB2HOSTNAME_LEN]; /* hostname of a sockpool connection */
     int cached_port;                    /* port of a sockpool connection */
     SBUF2 *sb;
+    int num_set_commands;
+    int num_set_commands_sent;
+    char **commands;
     int dbnum;
     int num_hosts;          /* total number of hosts */
     int num_hosts_sameroom; /* number of hosts that are in my datacenter (aka room) */
@@ -142,9 +145,9 @@ struct cdb2_hndl {
     char *sql;
     int ntypes;
     int *types;
-    uint8_t *last_buf;
+    unsigned char *last_buf;
     CDB2SQLRESPONSE *lastresponse;
-    uint8_t *first_buf;
+    unsigned char *first_buf;
     CDB2SQLRESPONSE *firstresponse;
     int error_in_trans;
     int client_side_error;
@@ -155,54 +158,72 @@ struct cdb2_hndl {
     int snapshot_offset;
     int query_no;
     int retry_all;
-    int num_set_commands;
-    int num_set_commands_sent;
     int is_read;
     int is_invalid;
     int is_rejected;
     unsigned long long rows_read;
     int read_intrans_results;
     int first_record_read;
-    char **commands;
     int ack;
     int is_hasql;
+    int sent_client_info;
+    void *user_arg;
+    int api_call_timeout;
+    int connect_timeout;
+    int comdb2db_timeout;
+    int socket_timeout;
+    int sockpool_send_timeoutms;
+    int sockpool_recv_timeoutms;
+    int *gbl_event_version; /* Cached global event version */
+    cdb2_event *events;
+    pid_t pid;
     int is_admin;
     int sockpool_enabled;
     int db_default_type_override_env;
     int clear_snap_line;
     int debug_trace;
     int max_retries;
     int min_retries;
-    ssl_mode c_sslmode;      /* client SSL mode */
-    peer_ssl_mode s_sslmode; /* server SSL mode */
-    int sslerr;              /* 1 if unrecoverable SSL error. */
-    char *sslpath;           /* SSL certificates */
+    /* client SSL mode */
+    ssl_mode c_sslmode;
+    /* server SSL mode */
+    peer_ssl_mode s_sslmode;
+    /* 1 if unrecoverable SSL error. */
+    int sslerr;
+
+    /* SSL certificate path. When specified, code looks for $sslpath/root.crt,
+       $sslpath/client.key, $sslpath/client.crt and $sslpath/root.crl, for
+       root certificate, client certificate, client key, and root CRL, respectively. */
+    char *sslpath;
+
+    /* client certificate. overrides sslpath when specified. */
     char *cert;
+    /* client key. overrides sslpath when specified. */
     char *key;
+    /* root CA certificate. overrides sslpath when specified. */
     char *ca;
+    /* root certificate revocation list (CRL). overrides sslpath when specified. */
     char *crl;
-    int cache_ssl_sess;
+
+    /* minimal TLS version. Set it to 0 if we want client and server to negotiate.
+       The final version will be the minimal version that are mutually understood by
+       both client and server. Set it to an TLS version (1.2, 1.3, etc.) to override.
+       Note that if either side does not support the version, handshake will fail. */
     double min_tls_ver;
+
+    /* 1 if caching ssl sessions (can speed up SSL handshake) */
+    int cache_ssl_sess;
     cdb2_ssl_sess *sess;
-    int nid_dbname;
     /* 1 if it's a newly established session which needs to be cached. */
     int newsess;
+
+    /* X509 attribute to check database name against */
+    int nid_dbname;
     struct context_messages context_msgs;
     char *env_tz;
-    int sent_client_info;
     char stack[MAX_STACK];
     int send_stack;
-    void *user_arg;
-    int *gbl_event_version; /* Cached global event version */
-    int api_call_timeout;
-    int connect_timeout;
-    int comdb2db_timeout;
-    int socket_timeout;
-    int sockpool_send_timeoutms;
-    int sockpool_recv_timeoutms;
     int request_fp; /* 1 if requesting the fingerprint; 0 otherwise. */
-    cdb2_event *events;
-    pid_t pid;
     // Protobuf allocator data used only for row data i.e. lastresponse
     ProtobufCAllocator s_allocator;
     void *protobuf_data;
@@ -217,5 +238,4 @@ struct cdb2_hndl {
     struct cdb2_stmt_types *stmt_types;
     RETRY_CALLBACK retry_clbk;
 };
-
 #endif

tests/tools/cdb2api_unit.c

@@ -24,8 +24,6 @@
 #include <bb_oscompat.h>
 #include <cdb2api.c>
 
-#define CDB2HOSTNAME_LEN 128
-
 void test_is_sql_read()
 {
     assert(is_sql_read(NULL) == -1);