src,include,test: make ssh server port configurable

bk138 · Jan 7, 2024 · 697cd52 · 697cd52
1 parent 152c214
commit 697cd52
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/include/libsshtunnel.h b/include/libsshtunnel.h
@@ -90,6 +90,7 @@ int ssh_tunnel_init();
    Once established, the tunnel entry will listen on localhost on the port
    indicated by \ref ssh_tunnel_get_port().
    @param ssh_host The SSH server host to connect to.
+   @param ssh_port The SSH server host's port to connect to.
    @param ssh_user The SSH user to authenticate as.
    @param ssh_password The SSH user password to authenticate with.
    @param remote_host The remote host to connect to from the SSH server.
@@ -100,6 +101,7 @@ int ssh_tunnel_init();
    @return An open SSH tunnel to \p remote_host via \p ssh_host, listening on localhost.
  */
 ssh_tunnel_t* ssh_tunnel_open_with_password(const char *ssh_host,
+                                            int ssh_port,
                                             const char *ssh_user,
                                             const char *ssh_password,
                                             const char *remote_host,
@@ -114,6 +116,7 @@ ssh_tunnel_t* ssh_tunnel_open_with_password(const char *ssh_host,
    Once established, the tunnel entry will listen on localhost on the port
    indicated by \ref ssh_tunnel_get_port().
    @param ssh_host The SSH server host to connect to.
+   @param ssh_port The SSH server host's port to connect to.
    @param ssh_user The SSH user to authenticate as.
    @param ssh_priv_key The SSH private key to authenticate with.
    @param ssh_priv_key_len The length in bytes of SSH private key to authenticate with.
@@ -126,6 +129,7 @@ ssh_tunnel_t* ssh_tunnel_open_with_password(const char *ssh_host,
    @return An open SSH tunnel to \p remote_host via \p ssh_host, listening on localhost.
  */
 ssh_tunnel_t* ssh_tunnel_open_with_privkey(const char *ssh_host,
+                                           int ssh_port,
                                            const char *ssh_user,
                                            const char *ssh_priv_key,
                                            int ssh_priv_key_len,

diff --git a/src/libsshtunnel.c b/src/libsshtunnel.c
@@ -249,6 +249,7 @@ void ssh_tunnel_exit() {
 
 
 static ssh_tunnel_t* ssh_tunnel_open(const char *ssh_host,
+                                     int ssh_port,
                                      const char *ssh_user,
                                      const char *ssh_password,
                                      const char *ssh_priv_key,
@@ -321,7 +322,7 @@ static ssh_tunnel_t* ssh_tunnel_open(const char *ssh_host,
         goto error;
     }
 
-    sin.sin_port = htons(22);
+    sin.sin_port = htons(ssh_port);
     if(connect(data->ssh_sock, (struct sockaddr*)(&sin), sizeof(struct sockaddr_in)) != 0) {
         if(data->signal_error_callback) {
             data->signal_error_callback(data->client, LIBSSHTUNNEL_ERROR_SSH_CONNECT, "ssh_tunnel_open: failed to connect to SSH server!\n");
@@ -512,6 +513,7 @@ static ssh_tunnel_t* ssh_tunnel_open(const char *ssh_host,
 
 
 ssh_tunnel_t *ssh_tunnel_open_with_password( const char *ssh_host,
+                                             int ssh_port,
                                              const char *ssh_user,
                                              const char *ssh_password,
                                              const char *remote_host,
@@ -520,6 +522,7 @@ ssh_tunnel_t *ssh_tunnel_open_with_password( const char *ssh_host,
                                              ssh_tunnel_fingerprint_check_func_t ssh_fingerprint_check_callback,
                                              ssh_tunnel_signal_error_func_t signal_error_callback) {
     return ssh_tunnel_open(ssh_host,
+                           ssh_port,
                            ssh_user,
                            ssh_password,
                            NULL,
@@ -534,6 +537,7 @@ ssh_tunnel_t *ssh_tunnel_open_with_password( const char *ssh_host,
 
 
 ssh_tunnel_t *ssh_tunnel_open_with_privkey(const char *ssh_host,
+                                           int ssh_port,
                                            const char *ssh_user,
                                            const char *ssh_priv_key,
                                            int ssh_priv_key_len,
@@ -544,6 +548,7 @@ ssh_tunnel_t *ssh_tunnel_open_with_privkey(const char *ssh_host,
                                            ssh_tunnel_fingerprint_check_func_t ssh_fingerprint_check_callback,
                                            ssh_tunnel_signal_error_func_t signal_error_callback) {
     return ssh_tunnel_open(ssh_host,
+                           ssh_port,
                            ssh_user,
                            NULL,
                            ssh_priv_key,

diff --git a/test/close-of-unused-tunnel.c b/test/close-of-unused-tunnel.c
@@ -18,6 +18,7 @@ int main() {
     assert(ssh_tunnel_init() == 0);
 
     ssh_tunnel_t *t = ssh_tunnel_open_with_password(getenv("LIBSSHTUNNEL_TEST_SSH_HOST"),
+                                                    atoi(getenv("LIBSSHTUNNEL_TEST_SSH_PORT")),
                                                     getenv("LIBSSHTUNNEL_TEST_SSH_USER"),
                                                     getenv("LIBSSHTUNNEL_TEST_SSH_PASSWORD"),
                                                     getenv("LIBSSHTUNNEL_TEST_REMOTE_HOST"),