1 files changed, 31 insertions, 22 deletions

diff --git a/Source/testing/sender_test.c b/Source/testing/sender_test.c
index 4559de0f4..391d71fbc 100644
--- a/Source/testing/sender_test.c
+++ b/Source/testing/sender_test.c
@@ -30,50 +30,59 @@
 #include <network/socket.h>
 #include <queues/send_queue.h>
 #include <queues/job_queue.h>
+#include <queues/jobs/incoming_packet_job.h>
 
 /**
  * Number of packets to send by sender-thread
  */
-#define NUMBER_OF_PACKETS_TO_SEND 50
-
-/**
- * Port to send the packets to
- */
-#define PORT_TO_SEND 4600
-
-/**
- * Destination IP Address
- */
-#define DESTINATION_IP "127.0.0.1"
+#define NUMBER_OF_PACKETS_TO_SEND 5
 
 void test_sender(protected_tester_t *tester)
 {
 	int i;
 	sender_t *sender;
+	receiver_t *receiver;
+	job_t *job;
 	packet_t *packet;
-	packet_t *received_packet;
-	chunk_t packet_data;
+	packet_t *received_packet;	
+	char test_data[] = {
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03, /* spi */
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05, /* spi */
+		0x05, /* next payload */
+		0x20, /* IKE version */
+		0x00, /* exchange type */
+		0x00, /* flags */
+		0x00,0x00,0x00,0x01, /* message id */
+		0x00,0x00,0x00,0x24, /* length */
+		0x12,0x34,0x56,0x67, /* some data */
+		0x12,0x34,0x56,0x67, 
+	};
+	chunk_t data = chunk_from_buf(test_data);
+	chunk_t received;
 	sender = sender_create();
+	receiver = receiver_create();
 
 	for (i = 0; i < NUMBER_OF_PACKETS_TO_SEND; i++)
 	{
 		packet = packet_create(AF_INET);
-		packet->set_destination(packet, host_create(AF_INET,DESTINATION_IP,PORT_TO_SEND));
-		packet_data.len = ( sizeof(int));
-		packet_data.ptr = malloc(packet_data.len);
-		*((int *) (packet_data.ptr)) = i;
-		packet->set_data(packet, packet_data);
+		packet->set_destination(packet, host_create(AF_INET, "127.0.0.1", 500));
+		packet->set_source(packet, host_create(AF_INET, "127.0.0.1", 500));
+		packet->set_data(packet, chunk_clone(data));
 		charon->send_queue->add(charon->send_queue,packet);
 	}
 
 	for (i = 0; i < NUMBER_OF_PACKETS_TO_SEND; i++)
 	{
-		charon->socket->receive(charon->socket,&received_packet);
-		packet_data = received_packet->get_data(received_packet);
-		tester->assert_true(tester, (packet_data.len == (sizeof(int))), "received data length check");
-		tester->assert_true(tester, (i == *((int *)(packet_data.ptr))), "received data value check");
+		job = charon->job_queue->get(charon->job_queue);
+		tester->assert_true(tester, (job->get_type(job) == INCOMING_PACKET), "job type check");
+		received_packet = ((incoming_packet_job_t *)(job))->get_packet((incoming_packet_job_t *)(job));
+		received = received_packet->get_data(received_packet);
+		tester->assert_true(tester, received.len == data.len, "received data length check");
+		tester->assert_true(tester, memcmp(received.ptr, data.ptr, data.len) == 0, "received data value check");
 		received_packet->destroy(received_packet);
+		job->destroy(job);
 	}
 
 	sender->destroy(sender);
+	receiver->destroy(receiver);
 }