cleanup: use ssh_ prefix in the buffer (non-static) functions

Having "ssh_" prefix in the functions' name will avoid possible clashes
when compiling libssh statically.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>

1 files changed, 21 insertions, 21 deletions

diff --git a/src/packet.c b/src/packet.c
index d16cd165..4636f261 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -253,11 +253,11 @@ int ssh_packet_socket_callback(const void *data, size_t receivedlen, void *user)
                  * Decrypt the rest of the packet (blocksize bytes already
                  * have been decrypted)
                  */
-                uint32_t buffer_len = buffer_get_rest_len(session->in_buffer);
+                uint32_t buffer_len = ssh_buffer_get_rest_len(session->in_buffer);
 
                 /* The following check avoids decrypting zero bytes */
                 if (buffer_len > blocksize) {
-                    uint8_t *payload = ((uint8_t*)buffer_get_rest(session->in_buffer) + blocksize);
+                    uint8_t *payload = ((uint8_t*)ssh_buffer_get_rest(session->in_buffer) + blocksize);
                     uint32_t plen = buffer_len - blocksize;
 
                     rc = packet_decrypt(session, payload, plen);
@@ -280,9 +280,9 @@ int ssh_packet_socket_callback(const void *data, size_t receivedlen, void *user)
             }
 
             /* skip the size field which has been processed before */
-            buffer_pass_bytes(session->in_buffer, sizeof(uint32_t));
+            ssh_buffer_pass_bytes(session->in_buffer, sizeof(uint32_t));
 
-            rc = buffer_get_u8(session->in_buffer, &padding);
+            rc = ssh_buffer_get_u8(session->in_buffer, &padding);
             if (rc == 0) {
                 ssh_set_error(session,
                               SSH_FATAL,
@@ -290,28 +290,28 @@ int ssh_packet_socket_callback(const void *data, size_t receivedlen, void *user)
                 goto error;
             }
 
-            if (padding > buffer_get_rest_len(session->in_buffer)) {
+            if (padding > ssh_buffer_get_rest_len(session->in_buffer)) {
                 ssh_set_error(session,
                               SSH_FATAL,
                               "Invalid padding: %d (%d left)",
                               padding,
-                              buffer_get_rest_len(session->in_buffer));
+                              ssh_buffer_get_rest_len(session->in_buffer));
                 goto error;
             }
-            buffer_pass_bytes_end(session->in_buffer, padding);
-            compsize = buffer_get_rest_len(session->in_buffer);
+            ssh_buffer_pass_bytes_end(session->in_buffer, padding);
+            compsize = ssh_buffer_get_rest_len(session->in_buffer);
 
 #ifdef WITH_ZLIB
             if (session->current_crypto
                 && session->current_crypto->do_compress_in
-                && buffer_get_rest_len(session->in_buffer) > 0) {
+                && ssh_buffer_get_rest_len(session->in_buffer) > 0) {
                 rc = decompress_buffer(session, session->in_buffer,MAX_PACKET_LEN);
                 if (rc < 0) {
                     goto error;
                 }
             }
 #endif /* WITH_ZLIB */
-            payloadsize = buffer_get_rest_len(session->in_buffer);
+            payloadsize = ssh_buffer_get_rest_len(session->in_buffer);
             session->recv_seq++;
             if (session->raw_counter != NULL) {
                 session->raw_counter->in_bytes += payloadsize;
@@ -489,7 +489,7 @@ int ssh_packet_parse_type(ssh_session session) {
     return SSH_ERROR;
   }
 
-  if(buffer_get_u8(session->in_buffer, &session->in_packet.type) == 0) {
+  if(ssh_buffer_get_u8(session->in_buffer, &session->in_packet.type) == 0) {
     ssh_set_error(session, SSH_FATAL, "Packet too short to read type");
     return SSH_ERROR;
   }
@@ -507,8 +507,8 @@ static int ssh_packet_write(ssh_session session) {
   int rc = SSH_ERROR;
 
   rc=ssh_socket_write(session->socket,
-      buffer_get_rest(session->out_buffer),
-      buffer_get_rest_len(session->out_buffer));
+      ssh_buffer_get_rest(session->out_buffer),
+      ssh_buffer_get_rest_len(session->out_buffer));
 
   return rc;
 }
@@ -518,7 +518,7 @@ static int packet_send2(ssh_session session) {
       session->current_crypto->out_cipher->blocksize : 8);
   enum ssh_hmac_e hmac_type = (session->current_crypto ?
       session->current_crypto->out_hmac : session->next_crypto->out_hmac);
-  uint32_t currentlen = buffer_get_rest_len(session->out_buffer);
+  uint32_t currentlen = ssh_buffer_get_rest_len(session->out_buffer);
   unsigned char *hmac = NULL;
   char padstring[32] = { 0 };
   int rc = SSH_ERROR;
@@ -531,11 +531,11 @@ static int packet_send2(ssh_session session) {
 #ifdef WITH_ZLIB
   if (session->current_crypto
       && session->current_crypto->do_compress_out
-      && buffer_get_rest_len(session->out_buffer)) {
+      && ssh_buffer_get_rest_len(session->out_buffer)) {
     if (compress_buffer(session,session->out_buffer) < 0) {
       goto error;
     }
-    currentlen = buffer_get_rest_len(session->out_buffer);
+    currentlen = ssh_buffer_get_rest_len(session->out_buffer);
   }
 #endif /* WITH_ZLIB */
   compsize = currentlen;
@@ -552,7 +552,7 @@ static int packet_send2(ssh_session session) {
 
   memcpy(&header[0], &finallen, sizeof(finallen));
   header[sizeof(finallen)] = padding;
-  rc = buffer_prepend_data(session->out_buffer, &header, sizeof(header));
+  rc = ssh_buffer_prepend_data(session->out_buffer, &header, sizeof(header));
   if (rc < 0) {
     goto error;
   }
@@ -563,12 +563,12 @@ 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,
-  			buffer_get_rest(session->out_buffer),buffer_get_rest_len(session->out_buffer)
-  			,buffer_get_rest_len(session->out_buffer));
+  			ssh_buffer_get_rest(session->out_buffer),ssh_buffer_get_rest_len(session->out_buffer)
+  			,ssh_buffer_get_rest_len(session->out_buffer));
   }
 #endif
-  hmac = packet_encrypt(session, buffer_get_rest(session->out_buffer),
-      buffer_get_rest_len(session->out_buffer));
+  hmac = packet_encrypt(session, ssh_buffer_get_rest(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));
     if (rc < 0) {