fixes & improvements

[lcr.git] / message.c

diff --git a/message.c b/message.c
index 97c032c..7b8ce57 100644 (file)
--- a/message.c
+++ b/message.c
@@ -1,6 +1,6 @@
 /*****************************************************************************\
 **                                                                           **
-** PBX4Linux                                                                 **
+** Linux Call Route                                                          **
 **                                                                           **
 **---------------------------------------------------------------------------**
 ** Copyright: Andreas Eversberg                                              **
@@ -19,36 +19,16 @@ MESSAGES
 struct message *message_first = NULL;
 struct message **messagepointer_end = &message_first;
 
-//#ifdef H323
-//PMutex mutex_message;
-//#endif
-
 /* 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 message *message;
-       int i = 0;
 
-       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 message *)MALLOC(sizeof(struct message));
        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;
@@ -60,11 +40,6 @@ 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)
 {
-       /* the mutex prevents from creating two messages at a time (h323 thread and main thread). */
-//#ifdef H323
-//     mutex_message.Wait();
-//#endif
-
        if (message->id_to == 0)
        {
                PDEBUG(DEBUG_MSG, "message %s not written, because destination is 0.\n", messages_txt[message->type]);
@@ -77,28 +52,31 @@ void message_put(struct message *message)
 
        *messagepointer_end = message;
        messagepointer_end = &(message->next);
-
-//#ifdef H323
-//     mutex_message.Signal();
-//#endif
 }
 
+void message_forward(int id_from, int id_to, int flow, union parameter *param)
+{
+       struct message *message;
+
+       /* get point to message */
+       message = (struct message *)((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);
+}
 
 /* detaches the first messages from the message chain */
 struct message *message_get(void)
 {
        struct message *message;
 
-       /* the mutex prevents from getting a message while creating a messages at a time (h323 thread and main thread). */
-//#ifdef H323
-//     mutex_message.Wait();
-//#endif
-
        if (!message_first)
        {
-//#ifdef H323
-//             mutex_message.Signal();
-//#endif
                return(0);
        }
 
@@ -107,11 +85,10 @@ struct message *message_get(void)
        if (!message_first)
                messagepointer_end = &message_first;
 
-//#ifdef H323
-//     mutex_message.Signal();
-//#endif
+       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);
@@ -120,8 +97,9 @@ struct message *message_get(void)
 /* free a message */
 void message_free(struct message *message)
 {
-       memset(message, 0, sizeof(struct message));
-       free(message);
+       if (message->keep)
+               return;
+       FREE(message, sizeof(struct message));
        mmemuse--;
 }