Fix sbuf2 leak in revconn

Signed-off-by: Mark Hannum <mhannum72@gmail.com>

Author: markhannum

bbinc/sbuf2.h

@@ -59,6 +59,8 @@ enum SBUF2_FLAGS {
     SBUF2_NO_BLOCK = 16,
     /* the underlying connection has been marked 'READONLY' */
     SBUF2_IS_READONLY = 32,
+    /* do not close ssl */
+    SBUF2_NO_SSL_CLOSE = 64,
 };
 
 typedef int (*sbuf2readfn)(SBUF2 *sb, char *buf, int nbytes);

db/comdb2.h

@@ -3510,6 +3510,9 @@ extern int gbl_max_sql_hint_cache;
 
 /* Remote cursor support */
 /* use portmux to open an SBUF2 to local db or proxied db */
+SBUF2 *connect_remote_db_flags(const char *protocol, const char *dbname, const char *service, char *host, int use_cache,
+                         int force_rte, int sbflags);
+
 SBUF2 *connect_remote_db(const char *protocol, const char *dbname, const char *service, char *host, int use_cache,
                          int force_rte);
 int get_rootpage_numbers(int nums);

db/reverse_conn.c

@@ -93,7 +93,7 @@ int send_reversesql_request(const char *dbname, const char *host, const char *co
         revconn_logmsg(LOGMSG_USER, "%s:%d Sending reversesql request to %s@%s\n", __func__, __LINE__, dbname, host);
     }
 
-    SBUF2 *sb = connect_remote_db(NULL, dbname, NULL, (char *)host, 0, gbl_revsql_force_rte);
+    SBUF2 *sb = connect_remote_db_flags(NULL, dbname, NULL, (char *)host, 0, gbl_revsql_force_rte, SBUF2_NO_SSL_CLOSE|SBUF2_NO_CLOSE_FD);
     if (!sb) {
         revconn_logmsg(LOGMSG_ERROR, "%s:%d Failed to connect to %s:%s\n", __func__, __LINE__, dbname, host);
         return 1;
@@ -123,11 +123,14 @@ int send_reversesql_request(const char *dbname, const char *host, const char *co
         revconn_logmsg(LOGMSG_USER, "%s:%d Sent '%s' through fd:%d\n", __func__, __LINE__, msg, new_fd);
     }
 
+    sbuf2close(sb);
+
     struct timeval timeout = {.tv_usec = 100 * 1000};
     return event_base_once(get_main_event_base(), new_fd, EV_READ, do_revconn_evbuffer, NULL, &timeout);
 
 cleanup:
     sbuf2close(sb);
+    Close(new_fd);
     return rc;
 }
 

db/sqlglue.c

@@ -11496,8 +11496,8 @@ int gbl_connect_remote_rte = 0;
  */
 int gbl_fdb_socket_timeout_ms;
 
-SBUF2 *connect_remote_db(const char *protocol, const char *dbname, const char *service, char *host, int use_cache,
-                         int force_rte)
+SBUF2 *connect_remote_db_flags(const char *protocol, const char *dbname, const char *service, char *host, int use_cache,
+                         int force_rte, int sbflags)
 {
     SBUF2 *sb;
     int port;
@@ -11553,7 +11553,7 @@ SBUF2 *connect_remote_db(const char *protocol, const char *dbname, const char *s
     (void)setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay));
 
 sbuf:
-    sb = sbuf2open(sockfd, 0);
+    sb = sbuf2open(sockfd, sbflags);
     if (!sb) {
         logmsg(LOGMSG_ERROR, "%s: failed to open sbuf\n", __func__);
         Close(sockfd);
@@ -11580,6 +11580,13 @@ SBUF2 *connect_remote_db(const char *protocol, const char *dbname, const char *s
     return sb;
 }
 
+SBUF2 *connect_remote_db(const char *protocol, const char *dbname, const char *service, char *host, int use_cache,
+                         int force_rte)
+{
+    return connect_remote_db_flags(protocol, dbname, service, host, use_cache, force_rte, 0);
+}
+
+
 int sqlite3PagerLockingMode(Pager *p, int mode) { return 0; }
 
 int sqlite3BtreeSecureDelete(Btree *btree, int arg) { return 0; }

util/sbuf2.c

@@ -119,15 +119,19 @@ int SBUF2_FUNC(sbuf2free)(SBUF2 *sb)
     if (sb == 0)
         return -1;
 
+    int rc = 0;
     /* Gracefully shutdown SSL to make the
        fd re-usable. Close the fd if it fails. */
-    int rc = sslio_close(sb, 1);
-    if (rc)
+    if (!(sb->flags & SBUF2_NO_SSL_CLOSE)) {
+        rc = sslio_close(sb, 1);
+        if (rc) {
 #if SBUF2_SERVER
-        Close(sb->fd);
+            Close(sb->fd);
 #else
-        close(sb->fd);
+            close(sb->fd);
 #endif
+        }
+    }
 
     sb->fd = -1;
     if (sb->rbuf) {
@@ -169,7 +173,8 @@ int SBUF2_FUNC(sbuf2close)(SBUF2 *sb)
 
     /* We need to send "close notify" alert
        before closing the underlying fd. */
-    sslio_close(sb, (sb->flags & SBUF2_NO_CLOSE_FD));
+    if (!(sb->flags & SBUF2_NO_SSL_CLOSE))
+        sslio_close(sb, (sb->flags & SBUF2_NO_CLOSE_FD));
 
     if (!(sb->flags & SBUF2_NO_CLOSE_FD)) {
 #if SBUF2_SERVER