src: Remove enter_function() and leave_function().

1 files changed, 5 insertions, 14 deletions

diff --git a/src/server.c b/src/server.c
index 59581ec..3ea2841 100644
--- a/src/server.c
+++ b/src/server.c
@@ -167,7 +167,7 @@ SSH_PACKET_CALLBACK(ssh_packet_kexdh_init){
   int rc;
   (void)type;
   (void)user;
-  enter_function();
+
   SSH_LOG(SSH_LOG_PACKET,"Received SSH_MSG_KEXDH_INIT");
   if(session->dh_handshake_state != DH_STATE_INIT){
     SSH_LOG(SSH_LOG_RARE,"Invalid state for SSH_MSG_KEXDH_INIT");
@@ -190,7 +190,7 @@ SSH_PACKET_CALLBACK(ssh_packet_kexdh_init){
   if (rc == SSH_ERROR)
       session->session_state = SSH_SESSION_STATE_ERROR;
   error:
-  leave_function();
+
   return SSH_PACKET_USED;
 }
 
@@ -317,7 +317,7 @@ static int dh_handshake_server(ssh_session session) {
  */
 static void ssh_server_connection_callback(ssh_session session){
 	int ssh1,ssh2;
-	enter_function();
+
 	switch(session->session_state){
 		case SSH_SESSION_STATE_NONE:
 		case SSH_SESSION_STATE_CONNECTING:
@@ -442,13 +442,12 @@ static void ssh_server_connection_callback(ssh_session session){
 		default:
 			ssh_set_error(session,SSH_FATAL,"Invalid state %d",session->session_state);
 	}
-	leave_function();
+
 	return;
-	error:
+error:
 	ssh_socket_close(session->socket);
 	session->alive = 0;
 	session->session_state=SSH_SESSION_STATE_ERROR;
-	leave_function();
 }
 
 /**
@@ -469,8 +468,6 @@ static int callback_receive_banner(const void *data, size_t len, void *user) {
     size_t i;
     int ret=0;
 
-    enter_function();
-
     for (i = 0; i < len; i++) {
 #ifdef WITH_PCAP
         if(session->pcap_ctx && buffer[i] == '\n') {
@@ -496,7 +493,6 @@ static int callback_receive_banner(const void *data, size_t len, void *user) {
             SSH_LOG(SSH_LOG_PACKET, "Received banner: %s", str);
             session->ssh_connection_callback(session);
 
-            leave_function();
             return ret;
         }
 
@@ -505,12 +501,10 @@ static int callback_receive_banner(const void *data, size_t len, void *user) {
             session->session_state = SSH_SESSION_STATE_ERROR;
             ssh_set_error(session, SSH_FATAL, "Receiving banner: too large banner");
 
-            leave_function();
             return 0;
         }
     }
 
-    leave_function();
     return ret;
 }
 
@@ -584,8 +578,6 @@ int ssh_auth_reply_default(ssh_session session,int partial) {
   ssh_string methods = NULL;
   int rc = SSH_ERROR;
 
-  enter_function();
-
   if (buffer_add_u8(session->out_buffer, SSH2_MSG_USERAUTH_FAILURE) < 0) {
     return rc;
   }
@@ -647,7 +639,6 @@ int ssh_auth_reply_default(ssh_session session,int partial) {
 error:
   ssh_string_free(methods);
 
-  leave_function();
   return rc;
 }