summaryrefslogtreecommitdiffstats
path: root/src/packet.c
diff options
context:
space:
mode:
authorFabiano Fidêncio <fidencio@redhat.com>2015-09-25 01:10:03 +0200
committerFabiano Fidêncio <fidencio@redhat.com>2015-10-12 13:56:21 +0200
commit154c3217f221a10c5157359755ea7dcae8eb1311 (patch)
tree704802989b66661c3624aaf053aa224721951c4f /src/packet.c
parent8dabdc7c417948f2966dba6ef1dede23d23d45f7 (diff)
buffer: rename ssh_buffer_get_rest() to ssh_buffer_get()
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Diffstat (limited to 'src/packet.c')
-rw-r--r--src/packet.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/packet.c b/src/packet.c
index f10467b1..17f50689 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -257,7 +257,7 @@ int ssh_packet_socket_callback(const void *data, size_t receivedlen, void *user)
/* The following check avoids decrypting zero bytes */
if (buffer_len > blocksize) {
- uint8_t *payload = ((uint8_t*)ssh_buffer_get_rest(session->in_buffer) + blocksize);
+ uint8_t *payload = ((uint8_t*)ssh_buffer_get(session->in_buffer) + blocksize);
uint32_t plen = buffer_len - blocksize;
rc = ssh_packet_decrypt(session, payload, plen);
@@ -507,7 +507,7 @@ static int ssh_packet_write(ssh_session session) {
int rc = SSH_ERROR;
rc=ssh_socket_write(session->socket,
- ssh_buffer_get_rest(session->out_buffer),
+ ssh_buffer_get(session->out_buffer),
ssh_buffer_get_rest_len(session->out_buffer));
return rc;
@@ -563,11 +563,11 @@ static int packet_send2(ssh_session session) {
#ifdef WITH_PCAP
if(session->pcap_ctx){
ssh_pcap_context_write(session->pcap_ctx,SSH_PCAP_DIR_OUT,
- ssh_buffer_get_rest(session->out_buffer),ssh_buffer_get_rest_len(session->out_buffer)
+ ssh_buffer_get(session->out_buffer),ssh_buffer_get_rest_len(session->out_buffer)
,ssh_buffer_get_rest_len(session->out_buffer));
}
#endif
- hmac = ssh_packet_encrypt(session, ssh_buffer_get_rest(session->out_buffer),
+ hmac = ssh_packet_encrypt(session, ssh_buffer_get(session->out_buffer),
ssh_buffer_get_rest_len(session->out_buffer));
if (hmac) {
rc = ssh_buffer_add_data(session->out_buffer, hmac, hmac_digest_len(hmac_type));