openbsd/libopenssh
1
0
Fork 0
mirror of https://github.com/openssh/libopenssh synced 2026-04-17 02:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

convert mux.c to new buffer API

Browse Source
This commit is contained in:
Damien Miller
2012-09-20 17:38:56 +10:00
parent 02bdd02dca
commit a873d2e3a2
3 changed files with 478 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ssh/msg.h
View File

@@ -25,7 +25,8 @@
#ifndef SSH_MSG_H
#define SSH_MSG_H
int ssh_msg_send(int, u_char, Buffer *);
int ssh_msg_recv(int, Buffer *);
struct sshbuf;
int ssh_msg_send(int, u_char, struct sshbuf *);
int ssh_msg_recv(int, struct sshbuf *);
#endif

842
ssh/mux.c
View File

File diff suppressed because it is too large Load Diff

25
ssh/ssh.c
View File

@@ -165,7 +165,7 @@ uid_t original_real_uid;
uid_t original_effective_uid;
/* command to be executed */
Buffer command;
struct sshbuf *command;
/* Should we execute a command or invoke a subsystem? */
int subsystem_flag = 0;
@@ -633,7 +633,8 @@ main(int ac, char **av)
ERR_load_crypto_strings();
/* Initialize the command to execute on remote host. */
buffer_init(&command);
if ((command = sshbuf_new()) == NULL)
fatal("sshbuf_new failed");
/*
* Save the command to execute on the remote host in a buffer. There
@@ -651,13 +652,13 @@ main(int ac, char **av)
/* A command has been specified. Store it into the buffer. */
for (i = 0; i < ac; i++) {
if (i)
buffer_append(&command, " ", 1);
buffer_append(&command, av[i], strlen(av[i]));
buffer_append(command, " ", 1);
buffer_append(command, av[i], strlen(av[i]));
}
}
/* Cannot fork to background if no command. */
if (fork_after_authentication_flag && buffer_len(&command) == 0 &&
if (fork_after_authentication_flag && buffer_len(command) == 0 &&
!no_shell_flag)
fatal("Cannot fork into background without a command "
"to execute.");
@@ -702,7 +703,7 @@ main(int ac, char **av)
tty_flag = 1;
/* Allocate a tty by default if no command specified. */
if (buffer_len(&command) == 0)
if (buffer_len(command) == 0)
tty_flag = options.request_tty != REQUEST_TTY_NO;
/* Force no tty */
@@ -1290,14 +1291,14 @@ ssh_session(struct ssh *ssh)
* If a command was specified on the command line, execute the
* command now. Otherwise request the server to start a shell.
*/
if (buffer_len(&command) > 0) {
int len = buffer_len(&command);
if (buffer_len(command) > 0) {
size_t len = sshbuf_len(command);
if (len > 900)
len = 900;
debug("Sending command: %.*s", len,
(u_char *)buffer_ptr(&command));
debug("Sending command: %.*s", (int)len, sshbuf_ptr(command));
ssh_packet_start(ssh, SSH_CMSG_EXEC_CMD);
ssh_packet_put_string(ssh, buffer_ptr(&command), buffer_len(&command));
ssh_packet_put_string(ssh, sshbuf_ptr(command),
sshbuf_len(command));
ssh_packet_send(ssh);
ssh_packet_write_wait(ssh);
} else {
@@ -1349,7 +1350,7 @@ ssh_session2_setup(int id, int success, void *arg)
}
client_session2_setup(ssh, id, tty_flag, subsystem_flag, getenv("TERM"),
NULL, fileno(stdin), &command, environ);
NULL, fileno(stdin), command, environ);
/* Tell the packet module whether this is an interactive session. */
ssh_packet_set_interactive(ssh, interactive,
options.ip_qos_interactive, options.ip_qos_bulk);