diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2016-11-05 20:00:02 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2016-11-05 20:00:02 +0100 |
commit | 5437deed1bd026ae00a2fb9209b6a87807fa358b (patch) | |
tree | 89f31f4a2626ccd6ad12effb78ed7720e6baf691 /src | |
parent | 422271bd40d3b2d89fd02232b715385286ce032a (diff) | |
download | libssh-5437deed1bd026ae00a2fb9209b6a87807fa358b.tar.gz libssh-5437deed1bd026ae00a2fb9209b6a87807fa358b.tar.xz libssh-5437deed1bd026ae00a2fb9209b6a87807fa358b.zip |
callbacks: Add support for MSVC
__typeof__ is GCC specific
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/channels.c | 3 | ||||
-rw-r--r-- | src/messages.c | 22 |
2 files changed, 17 insertions, 8 deletions
diff --git a/src/channels.c b/src/channels.c index f7cc086e..d32f0d7a 100644 --- a/src/channels.c +++ b/src/channels.c @@ -550,7 +550,8 @@ SSH_PACKET_CALLBACK(channel_rcv_data){ if (ssh_buffer_get(buf) == 0) { break; } - rest = ssh_callbacks_iterate_exec(channel->session, + rest = ssh_callbacks_iterate_exec(channel_data_function, + channel->session, channel, ssh_buffer_get(buf), ssh_buffer_get_len(buf), diff --git a/src/messages.c b/src/messages.c index 2b139fbc..7165d7cd 100644 --- a/src/messages.c +++ b/src/messages.c @@ -170,7 +170,8 @@ static int ssh_execute_server_request(ssh_session session, ssh_message msg) ssh_callbacks_iterate(channel->callbacks, ssh_channel_callbacks, channel_pty_request_function) { - rc = ssh_callbacks_iterate_exec(session, + rc = ssh_callbacks_iterate_exec(channel_pty_request_function, + session, channel, msg->channel_request.TERM, msg->channel_request.width, @@ -189,7 +190,9 @@ static int ssh_execute_server_request(ssh_session session, ssh_message msg) ssh_callbacks_iterate(channel->callbacks, ssh_channel_callbacks, channel_shell_request_function) { - rc = ssh_callbacks_iterate_exec(session, channel); + rc = ssh_callbacks_iterate_exec(channel_shell_request_function, + session, + channel); if (rc == 0) { ssh_message_channel_request_reply_success(msg); } else { @@ -202,7 +205,8 @@ static int ssh_execute_server_request(ssh_session session, ssh_message msg) ssh_callbacks_iterate(channel->callbacks, ssh_channel_callbacks, channel_x11_req_function) { - ssh_callbacks_iterate_exec(session, + ssh_callbacks_iterate_exec(channel_x11_req_function, + session, channel, msg->channel_request.x11_single_connection, msg->channel_request.x11_auth_protocol, @@ -216,7 +220,8 @@ static int ssh_execute_server_request(ssh_session session, ssh_message msg) ssh_callbacks_iterate(channel->callbacks, ssh_channel_callbacks, channel_pty_window_change_function) { - rc = ssh_callbacks_iterate_exec(session, + rc = ssh_callbacks_iterate_exec(channel_pty_window_change_function, + session, channel, msg->channel_request.width, msg->channel_request.height, @@ -229,7 +234,8 @@ static int ssh_execute_server_request(ssh_session session, ssh_message msg) ssh_callbacks_iterate(channel->callbacks, ssh_channel_callbacks, channel_exec_request_function) { - rc = ssh_callbacks_iterate_exec(session, + rc = ssh_callbacks_iterate_exec(channel_exec_request_function, + session, channel, msg->channel_request.command); if (rc == 0) { @@ -245,7 +251,8 @@ static int ssh_execute_server_request(ssh_session session, ssh_message msg) ssh_callbacks_iterate(channel->callbacks, ssh_channel_callbacks, channel_env_request_function) { - rc = ssh_callbacks_iterate_exec(session, + rc = ssh_callbacks_iterate_exec(channel_env_request_function, + session, channel, msg->channel_request.var_name, msg->channel_request.var_value); @@ -261,7 +268,8 @@ static int ssh_execute_server_request(ssh_session session, ssh_message msg) ssh_callbacks_iterate(channel->callbacks, ssh_channel_callbacks, channel_subsystem_request_function) { - rc = ssh_callbacks_iterate_exec(session, + rc = ssh_callbacks_iterate_exec(channel_subsystem_request_function, + session, channel, msg->channel_request.subsystem); if (rc == 0) { |