X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=message.c;h=ff0d70c9505e94d16a06a544e1a25a5e12bcf523;hp=0e4fd67d25cbfedbd006a3f869c33dd0ab620b74;hb=57549529c86785b7ecf5f56d2a3ff42b5e519755;hpb=fd2045584f7084d209607f4d717a66bea9afe88e

diff --git a/message.c b/message.c
index 0e4fd67..ff0d70c 100644
--- a/message.c
+++ b/message.c
@@ -1,6 +1,6 @@
 /*****************************************************************************\
 **                                                                           **
-** PBX4Linux                                                                 **
+** Linux Call Route                                                          **
 **                                                                           **
 **---------------------------------------------------------------------------**
 ** Copyright: Andreas Eversberg                                              **
@@ -9,42 +9,23 @@
 **                                                                           **
 \*****************************************************************************/ 
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 #include "main.h"
 
 MESSAGES
 
-struct message *message_first = NULL;
-struct message **messagepointer_end = &message_first;
+struct lcr_msg *message_first = NULL;
+struct lcr_msg **messagepointer_end = &message_first;
 
 /* creates a new message with the given attributes. the message must be filled then. after filling, the message_put must be called */
-struct message *message_create(int id_from, int id_to, int flow, int type)
+struct lcr_msg *message_create(int id_from, int id_to, int flow, int type)
 {
-	struct message *message;
-	int i = 0;
+	struct lcr_msg *message;
 
-	while(i < 10)
-	{
-		message = (struct message *)calloc(1, sizeof(struct message));
-		if (message)
-			break;
-
-		if (!i)
-			PERROR("no mem for message, retrying...\n");
-		i++;
-		usleep(300000);
-	}
+	message = (struct lcr_msg *)MALLOC(sizeof(struct lcr_msg));
 	if (!message)
-	{
-		PERROR("***Fatal error: no mem for message!!! exitting.\n");
-		exit(-1);
-	}
+		FATAL("No memory for message.\n");
 	mmemuse++;
 
-	memset(message, 0, sizeof(struct message));
-
 	message->id_from = id_from;
 	message->id_to = id_to;
 	message->flow = flow;
@@ -54,7 +35,7 @@ struct message *message_create(int id_from, int id_to, int flow, int type)
 }
 
 /* attaches a message to the end of the message chain */
-void message_put(struct message *message)
+void message_put(struct lcr_msg *message)
 {
 	if (message->id_to == 0)
 	{
@@ -68,13 +49,32 @@ void message_put(struct message *message)
 
 	*messagepointer_end = message;
 	messagepointer_end = &(message->next);
+	/* Nullify next pointer if recycled messages */
+	*messagepointer_end=NULL;
 }
 
+struct lcr_msg *message_forward(int id_from, int id_to, int flow, union parameter *param)
+{
+	struct lcr_msg *message;
+
+	/* get point to message */
+	message = (struct lcr_msg *)((unsigned long)param - ((unsigned long)(&message->param) - (unsigned long)message));
+
+	/* protect, so forwarded messages are not freed after handling */
+	message->keep = 1;
+
+	message->id_from = id_from;
+	message->id_to = id_to;
+	message->flow = flow;
+	message_put(message);
+
+	return(message);
+}
 
 /* detaches the first messages from the message chain */
-struct message *message_get(void)
+struct lcr_msg *message_get(void)
 {
-	struct message *message;
+	struct lcr_msg *message;
 
 	if (!message_first)
 	{
@@ -86,17 +86,21 @@ struct message *message_get(void)
 	if (!message_first)
 		messagepointer_end = &message_first;
 
+	message->keep = 0;
+
 	if ((options.deb&DEBUG_MSG) && message->type != MESSAGE_DATA)
+
 		PDEBUG(DEBUG_MSG, "message %s reading from %ld to %ld (memory %x)\n", messages_txt[message->type], message->id_from, message->id_to, message);
 
 	return(message);
 }
 
 /* free a message */
-void message_free(struct message *message)
+void message_free(struct lcr_msg *message)
 {
-	memset(message, 0, sizeof(struct message));
-	free(message);
+	if (message->keep)
+		return;
+	FREE(message, sizeof(struct lcr_msg));
 	mmemuse--;
 }