Mercurial > dropbear
changeset 973:3fbb9a72fb75
Merge pull request #5 from rcleere/ssh_client
Add SSH_CLIENT environment variable
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 21 Oct 2014 21:43:20 +0800 |
| parents | 0bb16232e7c4 (current diff) eb5cb4f45cd6 (diff) |
| children | 7c9377467934 |
| files | |
| diffstat | 2 files changed, 25 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/chansession.h Tue Aug 19 23:08:56 2014 +0800 +++ b/chansession.h Tue Oct 21 21:43:20 2014 +0800 @@ -54,6 +54,9 @@ /* Used to set $SSH_CONNECTION in the child session. Is only set temporarily before forking */ char *connection_string; + + /* Used to set $SSH_CLIENT in the child session. */ + char *client_string; #ifndef DISABLE_X11FWD struct Listener * x11listener;
--- a/svr-chansession.c Tue Aug 19 23:08:56 2014 +0800 +++ b/svr-chansession.c Tue Oct 21 21:43:20 2014 +0800 @@ -241,6 +241,7 @@ chansess = (struct ChanSess*)m_malloc(sizeof(struct ChanSess)); chansess->cmd = NULL; chansess->connection_string = NULL; + chansess->client_string = NULL; chansess->pid = 0; /* pty details */ @@ -617,6 +618,21 @@ return ret; } +static char* make_client_string() { + char *local_ip, *local_port, *remote_ip, *remote_port; + size_t len; + char *ret; + get_socket_address(ses.sock_in, &local_ip, &local_port, &remote_ip, &remote_port, 0); + len = strlen(local_ip) + strlen(local_port) + strlen(remote_ip) + strlen(remote_port) + 4; + ret = m_malloc(len); + snprintf(ret, len, "%s %s %s", remote_ip, remote_port, local_port); + m_free(local_ip); + m_free(local_port); + m_free(remote_ip); + m_free(remote_port); + return ret; +} + /* Handle a command request from the client. This is used for both shell * and command-execution requests, and passes the command to * noptycommand or ptycommand as appropriate. @@ -678,6 +694,7 @@ connection_string is freed below. */ #ifndef USE_VFORK chansess->connection_string = make_connection_string(); + chansess->client_string = make_client_string(); #endif if (chansess->term == NULL) { @@ -694,6 +711,7 @@ #ifndef USE_VFORK m_free(chansess->connection_string); + m_free(chansess->client_string); #endif if (ret == DROPBEAR_FAILURE) { @@ -949,6 +967,10 @@ if (chansess->connection_string) { addnewvar("SSH_CONNECTION", chansess->connection_string); } + + if (chansess->client_string) { + addnewvar("SSH_CLIENT", chansess->client_string); + } #ifdef ENABLE_SVR_PUBKEY_OPTIONS if (chansess->original_command) {