- changed memory allocator functions to own allocator calls

Source/charon/sender.c

@@ -1,8 +1,8 @@
 /**
  * @file sender.c
- * 
+ *
  * @brief Implements the Sender Thread encapsulated in the sender_t-object
- * 
+ *
  */
 
 /*
@@ -19,30 +19,30 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  */
- 
+
 #include <stdlib.h>
 #include <pthread.h>
 #include <freeswan.h>
 #include <pluto/constants.h>
 #include <pluto/defs.h>
- 
+
 #include "sender.h"
 #include "socket.h"
 #include "packet.h"
 #include "send_queue.h"
 #include "globals.h"
- 
+
 /**
  * Private data of a sender object
  */
 typedef struct private_sender_s private_sender_t;
- 
-struct private_sender_s { 	
+
+struct private_sender_s {
 	/**
 	 * Public part of a sender object
 	 */
 	 sender_t public;
-	 
+
 	 /**
 	  * Assigned thread to the sender_t-object
 	  */
@@ -52,7 +52,7 @@ struct private_sender_s {
 
 /**
  * Thread function started at creation of the sender object
- * 
+ *
  * @param this assigned sender object
  * @return SUCCESS if thread_function ended successfully, FAILED otherwise
  */
@@ -61,28 +61,28 @@ static void sender_thread_function(private_sender_t * this)
 	/* cancellation disabled by default */
 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
 	packet_t * current_packet;
-	
+
 	while (1)
 	{
 		while (global_send_queue->get(global_send_queue,&current_packet) == SUCCESS)
 		{
 			if (	global_socket->send(global_socket,current_packet) == SUCCESS)
 			{
-				current_packet->destroy(current_packet);				
+				current_packet->destroy(current_packet);
 			}
 			else
 			{
 				/* Packet could not be sent */
-				/* TODO LOG it */	
+				/* TODO LOG it */
 			}
 
 		}
 
 		/* NOT GOOD !!!!!! */
-		/* TODO LOG it */	
+		/* TODO LOG it */
 	}
-	
-	
+
+
 }
 
 /**
@@ -91,25 +91,25 @@ static void sender_thread_function(private_sender_t * this)
 static status_t destroy(private_sender_t *this)
 {
 	pthread_cancel(this->assigned_thread);
-	
+
 	pthread_join(this->assigned_thread, NULL);
 
-	pfree(this);
+	allocator_free(this);
 	return SUCCESS;
 }
 
 
 sender_t * sender_create()
 {
-	private_sender_t *this = alloc_thing(private_sender_t,"private_sender_t");
-	
+	private_sender_t *this = allocator_alloc_thing(private_sender_t,"private_sender_t");
+
 	this->public.destroy = (status_t(*)(sender_t*)) destroy;
 	if (pthread_create(&(this->assigned_thread), NULL, (void*(*)(void*))sender_thread_function, this) != 0)
 	{
 		/* thread could not be created  */
-		pfree(this);
+		allocator_free(this);
 		return NULL;
 	}
-	
+
 	return &(this->public);
 }