lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-12-02 01:17:52 +03:00
Code Activity

Fix build warnings in socket code.

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@220 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-02-02 16:56:31 +00:00
parent 9414b53bef
commit 1fd6a2e9e0
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/libssh/priv.h
View File

@@ -455,7 +455,7 @@ int agent_ident_count(struct ssh_session *session);
/* socket.c */ /* socket.c */
struct socket; struct socket;
void ssh_socket_init(); void ssh_socket_init(void);
struct socket *ssh_socket_new(SSH_SESSION *session); struct socket *ssh_socket_new(SSH_SESSION *session);
void ssh_socket_free(struct socket *s); void ssh_socket_free(struct socket *s);
void ssh_socket_set_fd(struct socket *s, socket_t fd); void ssh_socket_set_fd(struct socket *s, socket_t fd);
@@ -469,8 +469,9 @@ int ssh_socket_write(struct socket *s,const void *buffer, int len);
int ssh_socket_is_open(struct socket *s); int ssh_socket_is_open(struct socket *s);
int ssh_socket_fd_isset(struct socket *s, fd_set *set); int ssh_socket_fd_isset(struct socket *s, fd_set *set);
void ssh_socket_fd_set(struct socket *s, fd_set *set, int *fd_max); void ssh_socket_fd_set(struct socket *s, fd_set *set, int *fd_max);
int ssh_socket_completeread(struct socket *s, void *buffer, int len); int ssh_socket_completeread(struct socket *s, void *buffer, u32 len);
int ssh_socket_wait_for_data(struct socket *s, SSH_SESSION *session,int len); int ssh_socket_completewrite(struct socket *s, void *buffer, u32 len);
int ssh_socket_wait_for_data(struct socket *s, SSH_SESSION *session, u32 len);
int ssh_socket_nonblocking_flush(struct socket *s); int ssh_socket_nonblocking_flush(struct socket *s);
int ssh_socket_blocking_flush(struct socket *s); int ssh_socket_blocking_flush(struct socket *s);
int ssh_socket_poll(struct socket *s, int *write, int *except); int ssh_socket_poll(struct socket *s, int *write, int *except);

31
libssh/socket.c
View File

@@ -71,7 +71,7 @@ struct socket {
* \internal * \internal
* \brief inits the socket system (windows specific) * \brief inits the socket system (windows specific)
*/ */
void ssh_socket_init(){ void ssh_socket_init(void){
#ifdef _WIN32 #ifdef _WIN32
struct WSAData wsaData; struct WSAData wsaData;
if (WSAStartup(MAKEWORD(2, 0), &wsaData)) { if (WSAStartup(MAKEWORD(2, 0), &wsaData)) {
@@ -175,7 +175,7 @@ int ssh_socket_is_open(struct socket *s){
/* \internal /* \internal
* \brief read len bytes from socket into buffer * \brief read len bytes from socket into buffer
*/ */
int ssh_socket_unbuffered_read(struct socket *s, void *buffer, int len){ static int ssh_socket_unbuffered_read(struct socket *s, void *buffer, u32 len) {
int r; int r;
if(s->data_except) if(s->data_except)
return -1; return -1;
@@ -194,7 +194,8 @@ int ssh_socket_unbuffered_read(struct socket *s, void *buffer, int len){
/* \internal /* \internal
* \brief writes len bytes from buffer to socket * \brief writes len bytes from buffer to socket
*/ */
int ssh_socket_unbuffered_write(struct socket *s,const void *buffer, int len){ static int ssh_socket_unbuffered_write(struct socket *s,const void *buffer,
u32 len) {
int w; int w;
if(s->data_except) if(s->data_except)
return -1; return -1;
@@ -235,10 +236,10 @@ void ssh_socket_fd_set(struct socket *s, fd_set *set, int *fd_max){
/** \internal /** \internal
* \brief reads blocking until len bytes have been read * \brief reads blocking until len bytes have been read
*/ */
int ssh_socket_completeread(struct socket *s, void *buffer, int len){ int ssh_socket_completeread(struct socket *s, void *buffer, u32 len){
int r; int r;
int total=0; u32 total=0;
int toread=len; u32 toread=len;
if(!ssh_socket_is_open(s)) if(!ssh_socket_is_open(s))
return SSH_ERROR; return SSH_ERROR;
while((r=ssh_socket_unbuffered_read(s,buffer+total,toread))){ while((r=ssh_socket_unbuffered_read(s,buffer+total,toread))){
@@ -258,10 +259,11 @@ int ssh_socket_completeread(struct socket *s, void *buffer, int len){
* \brief Blocking write of len bytes * \brief Blocking write of len bytes
*/ */
int ssh_socket_completewrite(struct socket *s, void *buffer, int len){ int ssh_socket_completewrite(struct socket *s, void *buffer, u32 len){
SSH_SESSION *session=s->session; SSH_SESSION *session=s->session;
enter_function();
int written; int written;
enter_function();
if(!ssh_socket_is_open(s)){ if(!ssh_socket_is_open(s)){
leave_function(); leave_function();
return SSH_ERROR; return SSH_ERROR;
@@ -286,8 +288,10 @@ int ssh_socket_completewrite(struct socket *s, void *buffer, int len){
*/ */
int ssh_socket_read(struct socket *s, void *buffer, int len){ int ssh_socket_read(struct socket *s, void *buffer, int len){
SSH_SESSION *session=s->session; SSH_SESSION *session=s->session;
int ret;
enter_function(); enter_function();
int ret=ssh_socket_wait_for_data(s,s->session,len); ret = ssh_socket_wait_for_data(s, s->session, len);
if(ret != SSH_OK){ if(ret != SSH_OK){
leave_function(); leave_function();
return ret; return ret;
@@ -306,8 +310,9 @@ int ssh_socket_read(struct socket *s, void *buffer, int len){
*/ */
int ssh_socket_write(struct socket *s,const void *buffer, int len){ int ssh_socket_write(struct socket *s,const void *buffer, int len){
SSH_SESSION *session=s->session; SSH_SESSION *session=s->session;
enter_function();
int ret; int ret;
enter_function();
buffer_add_data(s->out_buffer,buffer,len); buffer_add_data(s->out_buffer,buffer,len);
if(buffer_get_rest_len(s->out_buffer) > WRITE_BUFFERING_THRESHOLD) if(buffer_get_rest_len(s->out_buffer) > WRITE_BUFFERING_THRESHOLD)
ret=ssh_socket_nonblocking_flush(s); ret=ssh_socket_nonblocking_flush(s);
@@ -327,7 +332,7 @@ int ssh_socket_write(struct socket *s,const void *buffer, int len){
* \returns SSH_AGAIN need to call later for data * \returns SSH_AGAIN need to call later for data
* \returns SSH_ERROR error happened * \returns SSH_ERROR error happened
*/ */
int ssh_socket_wait_for_data(struct socket *s, SSH_SESSION *session,int len){ int ssh_socket_wait_for_data(struct socket *s, SSH_SESSION *session, u32 len){
int except, can_write; int except, can_write;
int to_read; int to_read;
int r; int r;
@@ -378,7 +383,7 @@ int ssh_socket_wait_for_data(struct socket *s, SSH_SESSION *session,int len){
leave_function(); leave_function();
return SSH_ERROR; return SSH_ERROR;
} }
buffer_add_data(s->in_buffer,buffer,r); buffer_add_data(s->in_buffer,buffer, (u32) r);
} while(buffer_get_rest_len(s->in_buffer)<len); } while(buffer_get_rest_len(s->in_buffer)<len);
leave_function(); leave_function();
return SSH_OK; return SSH_OK;