lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-07-29 13:01:13 +03:00
Code Activity

src: Define MAX_BUF_SIZE globally and use it.

Browse Source 
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Joseph Southwell
2014-02-02 19:28:51 +01:00
committed by Andreas Schneider
parent eedecd0269
commit 6bbdaceaca
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/libssh/priv.h
View File

@ -120,11 +120,24 @@ int gettimeofday(struct timeval *__p, void *__t);
#include "libssh/callbacks.h" #include "libssh/callbacks.h"
/* some constants */ /* some constants */
#ifndef MAX_PACKAT_LEN
#define MAX_PACKET_LEN 262144 #define MAX_PACKET_LEN 262144
#endif
#ifndef ERROR_BUFFERLEN
#define ERROR_BUFFERLEN 1024 #define ERROR_BUFFERLEN 1024
#endif
#ifndef CLIENTBANNER1
#define CLIENTBANNER1 "SSH-1.5-libssh-" SSH_STRINGIFY(LIBSSH_VERSION) #define CLIENTBANNER1 "SSH-1.5-libssh-" SSH_STRINGIFY(LIBSSH_VERSION)
#endif
#ifndef CLIENTBANNER2
#define CLIENTBANNER2 "SSH-2.0-libssh-" SSH_STRINGIFY(LIBSSH_VERSION) #define CLIENTBANNER2 "SSH-2.0-libssh-" SSH_STRINGIFY(LIBSSH_VERSION)
#endif
#ifndef KBDINT_MAX_PROMPT
#define KBDINT_MAX_PROMPT 256 /* more than openssh's :) */ #define KBDINT_MAX_PROMPT 256 /* more than openssh's :) */
#endif
#ifndef MAX_BUF_SIZE
#define MAX_BUF_SIZE 4096
#endif
#ifndef __FUNCTION__ #ifndef __FUNCTION__
#if defined(__SUNPRO_C) #if defined(__SUNPRO_C)

1
src/misc.c
View File

@ -697,7 +697,6 @@ char *ssh_path_expand_tilde(const char *d) {
} }
char *ssh_path_expand_escape(ssh_session session, const char *s) { char *ssh_path_expand_escape(ssh_session session, const char *s) {
#define MAX_BUF_SIZE 4096
char host[NI_MAXHOST]; char host[NI_MAXHOST];
char buf[MAX_BUF_SIZE]; char buf[MAX_BUF_SIZE];
char *r, *x = NULL; char *r, *x = NULL;

4
src/scp.c
View File

@ -545,7 +545,7 @@ int ssh_scp_read_string(ssh_scp scp, char *buffer, size_t len){
* @see ssh_scp_request_get_warning() * @see ssh_scp_request_get_warning()
*/ */
int ssh_scp_pull_request(ssh_scp scp){ int ssh_scp_pull_request(ssh_scp scp){
char buffer[4096] = {0}; char buffer[MAX_BUF_SIZE] = {0};
char *mode=NULL; char *mode=NULL;
char *p,*tmp; char *p,*tmp;
uint64_t size; 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. * the message failed, or sending it in a bad state.
*/ */
int ssh_scp_deny_request(ssh_scp scp, const char *reason){ int ssh_scp_deny_request(ssh_scp scp, const char *reason){
char buffer[4096]; char buffer[MAX_BUF_SIZE];
int err; int err;
if(scp==NULL) if(scp==NULL)
return SSH_ERROR; return SSH_ERROR;

2
src/sftp.c
View File

@ -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) { sftp_packet sftp_packet_read(sftp_session sftp) {
unsigned char buffer[4096]; unsigned char buffer[MAX_BUF_SIZE];
sftp_packet packet = NULL; sftp_packet packet = NULL;
uint32_t size; uint32_t size;
int r; int r;

2
src/socket.c
View File

@ -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){ 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; ssh_socket s=(ssh_socket )v_s;
char buffer[4096]; char buffer[MAX_BUF_SIZE];
int r; int r;
int err=0; int err=0;
socklen_t errlen=sizeof(err); socklen_t errlen=sizeof(err);