Thanks to visit codestin.com
Credit goes to github.com

Skip to content

rtrlib/transport: change port from int to char in ssh transport #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

rtrlib/transport: change port from int to char in ssh transport #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
rtrlib/transport: change port from int to char in ssh transport
  • Loading branch information
@smlng
smlng committed Sep 6, 2016
commit b2ca6216aa5cda0599e9b55d4d07eb0aa6838f15
16 changes: 8 additions & 8 deletions rtrlib/transport/ssh/ssh_transport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
#include "../../lib/utils.h"
#include "ssh_transport.h"

#define SSH_DBG(fmt, sock, ...) lrtr_dbg("SSH Transport(%s@%s:%u): " fmt, (sock)->config.username, (sock)->config.host, (sock)->config.port, ## __VA_ARGS__)
#define SSH_DBG1(a, sock) lrtr_dbg("SSH Transport(%s@%s:%u): " a, (sock)->config.username, (sock)->config.host, (sock)->config.port)
#define SSH_DBG(fmt, sock, ...) lrtr_dbg("SSH Transport(%s@%s:%s): " fmt, (sock)->config.username, (sock)->config.host, (sock)->config.port, ## __VA_ARGS__)
#define SSH_DBG1(a, sock) lrtr_dbg("SSH Transport(%s@%s:%s): " a, (sock)->config.username, (sock)->config.host, (sock)->config.port)

struct tr_ssh_socket {
ssh_session session;
ssh_channel channel;
struct tr_ssh_config config;
char *ident;
ssh_session session;
ssh_channel channel;
struct tr_ssh_config config;
char *ident;
};

static int tr_ssh_open(void *tr_ssh_sock);
Expand Down Expand Up @@ -52,7 +52,7 @@ int tr_ssh_open(void *socket)
ssh_options_set(ssh_socket->session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);

ssh_options_set(ssh_socket->session, SSH_OPTIONS_HOST, config->host);
ssh_options_set(ssh_socket->session, SSH_OPTIONS_PORT, &(config->port));
ssh_options_set(ssh_socket->session, SSH_OPTIONS_PORT_STR, &(config->port));
ssh_options_set(ssh_socket->session, SSH_OPTIONS_BINDADDR, config->bindaddr);
ssh_options_set(ssh_socket->session, SSH_OPTIONS_USER, config->username);

Expand Down Expand Up @@ -184,7 +184,7 @@ const char *tr_ssh_ident(void *tr_ssh_sock)
sock->ident = malloc(len);
if (sock->ident == NULL)
return NULL;
snprintf(sock->ident, len, "%s@%s:%u", sock->config.username,
snprintf(sock->ident, len, "%s@%s:%s", sock->config.username,
sock->config.host, sock->config.port);
return sock->ident;
}
Expand Down
14 changes: 7 additions & 7 deletions rtrlib/transport/ssh/ssh_transport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@
* determination by OS.
* @param username Username for authentication.
* @param server_hostkey_path Path to public SSH key of the server or NULL to
don't verify host authenticity.
* don't verify host authenticity.
* @param client_privkey_path Path to private key of the authentication keypair
* or NULL to use ~/.ssh/id_rsa.
*/
struct tr_ssh_config {
char *host;
unsigned int port;
char *bindaddr;
char *username;
char *server_hostkey_path;
char *client_privkey_path;
char *host;
char *port;
char *bindaddr;
char *username;
char *server_hostkey_path;
char *client_privkey_path;
};

/**
Expand Down
1 change: 1 addition & 0 deletions scripts/check-coding-files.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ rtrlib/rtr_mgr.h
rtrlib/rtr_mgr.c
rtrlib/pfx/lpfst/lpfst.h
rtrlib/pfx/lpfst/lpfst.c
rtrlib/transport/ssh/ssh_transport.h
tests/test_ht_spkitable.c
tests/test_ht_spkitable_locks.c
tests/test_live_validation.c
Expand Down
4 changes: 1 addition & 3 deletions tools/rtrclient.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,9 @@ int main(int argc, char **argv)
}
#ifdef RTRLIB_HAVE_LIBSSH
else {
unsigned int iport = atoi(port);

ssh_config = (struct tr_ssh_config) {
host,
iport,
port,
NULL,
user,
hostkey,
Expand Down