diff options
author | Joseph Southwell <joseph@southwell.org> | 2014-02-02 19:28:51 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2014-02-02 22:21:07 +0100 |
commit | 96ad690c80440c113c9db2b2fc53112c32d2fbcf (patch) | |
tree | e2ec5b5462dc7129db15d4d10d1d218f139327f6 | |
parent | 0d82186503185bebe44145e31f057c0a1a120011 (diff) | |
download | libssh-96ad690c80440c113c9db2b2fc53112c32d2fbcf.tar.gz libssh-96ad690c80440c113c9db2b2fc53112c32d2fbcf.tar.xz libssh-96ad690c80440c113c9db2b2fc53112c32d2fbcf.zip |
src: Define MAX_BUF_SIZE globally and use it.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r-- | include/libssh/priv.h | 13 | ||||
-rw-r--r-- | src/misc.c | 1 | ||||
-rw-r--r-- | src/scp.c | 4 | ||||
-rw-r--r-- | src/sftp.c | 2 | ||||
-rw-r--r-- | src/socket.c | 2 |
5 files changed, 17 insertions, 5 deletions
diff --git a/include/libssh/priv.h b/include/libssh/priv.h index c1707344..87f59e51 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -120,11 +120,24 @@ int gettimeofday(struct timeval *__p, void *__t); #include "libssh/callbacks.h" /* some constants */ +#ifndef MAX_PACKAT_LEN #define MAX_PACKET_LEN 262144 +#endif +#ifndef ERROR_BUFFERLEN #define ERROR_BUFFERLEN 1024 +#endif +#ifndef CLIENTBANNER1 #define CLIENTBANNER1 "SSH-1.5-libssh-" SSH_STRINGIFY(LIBSSH_VERSION) +#endif +#ifndef CLIENTBANNER2 #define CLIENTBANNER2 "SSH-2.0-libssh-" SSH_STRINGIFY(LIBSSH_VERSION) +#endif +#ifndef KBDINT_MAX_PROMPT #define KBDINT_MAX_PROMPT 256 /* more than openssh's :) */ +#endif +#ifndef MAX_BUF_SIZE +#define MAX_BUF_SIZE 4096 +#endif #ifndef __FUNCTION__ #if defined(__SUNPRO_C) @@ -697,7 +697,6 @@ char *ssh_path_expand_tilde(const char *d) { } char *ssh_path_expand_escape(ssh_session session, const char *s) { -#define MAX_BUF_SIZE 4096 char host[NI_MAXHOST]; char buf[MAX_BUF_SIZE]; char *r, *x = NULL; @@ -545,7 +545,7 @@ int ssh_scp_read_string(ssh_scp scp, char *buffer, size_t len){ * @see ssh_scp_request_get_warning() */ int ssh_scp_pull_request(ssh_scp scp){ - char buffer[4096] = {0}; + char buffer[MAX_BUF_SIZE] = {0}; char *mode=NULL; char *p,*tmp; uint64_t size; @@ -642,7 +642,7 @@ int ssh_scp_pull_request(ssh_scp scp){ * the message failed, or sending it in a bad state. */ int ssh_scp_deny_request(ssh_scp scp, const char *reason){ - char buffer[4096]; + char buffer[MAX_BUF_SIZE]; int err; if(scp==NULL) return SSH_ERROR; @@ -308,7 +308,7 @@ int sftp_packet_write(sftp_session sftp, uint8_t type, ssh_buffer payload){ } sftp_packet sftp_packet_read(sftp_session sftp) { - unsigned char buffer[4096]; + unsigned char buffer[MAX_BUF_SIZE]; sftp_packet packet = NULL; uint32_t size; int r; diff --git a/src/socket.c b/src/socket.c index 1a0bdea6..8e5a75cf 100644 --- a/src/socket.c +++ b/src/socket.c @@ -218,7 +218,7 @@ void ssh_socket_set_callbacks(ssh_socket s, ssh_socket_callbacks callbacks){ */ int ssh_socket_pollcallback(struct ssh_poll_handle_struct *p, socket_t fd, int revents, void *v_s){ ssh_socket s=(ssh_socket )v_s; - char buffer[4096]; + char buffer[MAX_BUF_SIZE]; int r; int err=0; socklen_t errlen=sizeof(err); |