new clonning function added

Makefile.defs

@@ -46,7 +46,7 @@ ARCH = $(shell uname -s)
 #		malloc etc.)
 DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
 	 -DDNS_IP_HACK  -DPKG_MALLOC -DSHM_MEM  -DSHM_MMAP \
-	 -DNO_DEBUG #-DDBG_QM_MALLOC
+	  #-DNO_DEBUG #-DDBG_QM_MALLOC
 #-DEXTRA_DEBUG
 # -DUSE_SHM_MEM
 #-DNO_DEBUG 

modules/tm/sip_msg.c

@@ -7,6 +7,11 @@
 #include "../../dprint.h"
 #include "../../mem.h"
 
+char*   translate_pointer( char* new_buf , char *org_buf , char* p);
+struct via_body* via_body_cloner( char* new_buf , char *org_buf , struct via_body *org_via);
+struct hdr_field* header_cloner( struct sip_msg *new_msg , struct sip_msg *org_msg, struct hdr_field *hdr);
+
+struct via_body* via_body_cloner_2( char* new_buf , char *org_buf , struct via_body *org_via, char **p);
 
 
 struct sip_msg* sip_msg_cloner_1( struct sip_msg *org_msg )
@@ -79,7 +84,7 @@ struct sip_msg* sip_msg_cloner_1( struct sip_msg *org_msg )
     }
 
     /* new_uri  ( str type )*/
-	if (org_msg->new_uri.s){ 
+	if (org_msg->new_uri.s){
 		if (!(new_msg->new_uri.s = (char*)sh_malloc( org_msg->new_uri.len )))
 		{
 			DBG("DEBUG: sip_msg_cloner: new_msg->new_uri.s allocation failed\n");
@@ -115,7 +120,7 @@ struct sip_msg* sip_msg_cloner_1( struct sip_msg *org_msg )
 			DBG("DEBUG: sip_msg_cloner:  new_msg->via1 allocation failed\n");
 			goto hf_error;
 		    }
-		    
+
 		    new_hdr->parsed  = (void*)new_msg->via1;
 		     if ( new_msg->via1->next )
 		        new_msg->via2 = new_msg->via1->next;
@@ -471,6 +476,233 @@ void sip_msg_free_1(struct sip_msg* msg)
 
 struct sip_msg*  sip_msg_cloner_2( struct sip_msg *org_msg )
 {
+   unsigned int         len;
+   struct hdr_field    *hdr,*new_hdr,*last_hdr;
+   struct via_body    *via;
+   struct via_param *prm;
+   struct sip_msg     *new_msg;
+   char                       *p;
+
+
+   /*computing the length of entire sip_msg structure*/
+   len = sizeof( struct sip_msg );
+   /*we will keep only the original msg*/
+   len += org_msg->len;
+   /*the new uri (if any)*/
+   if (org_msg->new_uri.s && org_msg->new_uri.len)
+      len+= org_msg->new_uri.len;
+   /*all the headers*/
+   for( hdr=org_msg->headers ; hdr ; hdr=hdr->next )
+   {
+      /*sze of header struct*/
+      len += sizeof( struct hdr_field);
+      switch (hdr->type)
+      {
+         case HDR_CSEQ:
+                   len+=sizeof(struct cseq_body);
+                   break;
+         case HDR_VIA:
+                   for (via=(struct via_body*)hdr->parsed;via;via=via->next)
+                   {
+                      len+=sizeof(struct via_body);
+                      /*via param*/
+                      for(prm=via->param_lst;prm;prm=prm->next)
+                         len+=sizeof(struct via_param );
+                   }
+                   break;
+      }
+   }
+
+
+   p=(char *)sh_malloc(len);
+   if (!p)
+   {
+      LOG(L_ERR , "ERROR: sip_msg_cloner_2: cannot allocate memory\n" );
+      return 0;
+   }
+
+   /*filling up the new structure*/
+   new_msg = (struct sip_msg*)p;
+   /*sip msg structure*/
+   memcpy( new_msg , org_msg , sizeof(struct sip_msg) );
+   p += sizeof(struct sip_msg);
+   new_msg->add_rm = new_msg->repl_add_rm = 0;
+   /*new_uri*/
+   if (org_msg->new_uri.s && org_msg->new_uri.len)
+   {
+      new_msg->new_uri.s = p;
+      memcpy( p , org_msg->new_uri.s , org_msg->new_uri.len);
+      p += org_msg->new_uri.len;
+   }
+   /*message buffers(org and scratch pad)*/
+   memcpy( p , org_msg->orig , org_msg->len);
+   new_msg->orig = new_msg->buf = p;
+   p += new_msg->len;
+   /*unparsed and eoh pointer*/
+   new_msg->unparsed = translate_pointer( new_msg->buf , org_msg->buf , org_msg->unparsed );
+   new_msg->eoh = translate_pointer( new_msg->buf , org_msg->buf , org_msg->eoh );
+   /* first line, updating the pointers*/
+   if ( org_msg->first_line.type==SIP_REQUEST )
+   {
+      new_msg->first_line.u.request.method.s = translate_pointer( new_msg->buf , org_msg->buf , org_msg->first_line.u.request.method.s );
+      new_msg->first_line.u.request.uri.s = translate_pointer( new_msg->buf , org_msg->buf , org_msg->first_line.u.request.uri.s );
+      new_msg->first_line.u.request.version.s = translate_pointer( new_msg->buf , org_msg->buf , org_msg->first_line.u.request.version.s );
+   }
+   else if ( org_msg->first_line.type==SIP_REPLY )
+   {
+      new_msg->first_line.u.reply.version.s = translate_pointer( new_msg->buf , org_msg->buf , org_msg->first_line.u.reply.version.s );
+      new_msg->first_line.u.reply.status.s =  translate_pointer( new_msg->buf , org_msg->buf , org_msg->first_line.u.reply.status.s );
+      new_msg->first_line.u.reply.reason.s =  translate_pointer( new_msg->buf , org_msg->buf , org_msg->first_line.u.reply.reason.s );
+    }
+
+   /*headers list*/
+   new_msg->via1=0;
+   new_msg->via2=0;
+   for( hdr=org_msg->headers,last_hdr=0 ; hdr ; hdr=hdr->next )
+   {
+      new_hdr = (struct hdr_field*)p;
+      memcpy(new_hdr, hdr, sizeof(struct hdr_field) );
+      p += sizeof( struct hdr_field);
+      new_hdr->name.s =  translate_pointer( new_msg->buf , org_msg->buf , hdr->name.s );
+      new_hdr->body.s =  translate_pointer( new_msg->buf , org_msg->buf , hdr->body.s );
+
+     switch (hdr->type)
+      {
+         case HDR_VIA:
+                if ( !new_msg->via1 )
+                   {
+                       new_msg->h_via1 = new_hdr;
+                       new_msg->via1 = via_body_cloner_2( new_msg->buf , org_msg->buf , (struct via_body*)hdr->parsed , &p);
+                       new_hdr->parsed  = (void*)new_msg->via1;
+                   if ( new_msg->via1->next )
+                            new_msg->via2 = new_msg->via1->next;
+                   }
+                else if ( !new_msg->via2 && new_msg->via1 )
+                   {
+                       new_msg->h_via2 = new_hdr;
+                       if ( new_msg->via1->next )
+                           new_hdr->parsed = (void*)new_msg->via1->next;
+                       else{
+                           new_msg->via2 = via_body_cloner_2( new_msg->buf , org_msg->buf , (struct via_body*)hdr->parsed , &p);
+                           new_hdr->parsed  = (void*)new_msg->via2;
+                       }
+                   }
+                else if ( new_msg->via2 && new_msg->via1 )
+                   {
+                       new_hdr->parsed  = new_msg->via1 = via_body_cloner_2( new_msg->buf , org_msg->buf , (struct via_body*)hdr->parsed , &p);
+                   }
+                   break;
+         case HDR_CSEQ:
+                   new_hdr->parsed = p;
+                   p +=sizeof(struct cseq_body);
+                   memcpy( new_hdr->parsed , hdr->parsed , sizeof(struct cseq_body) );
+                   ((struct cseq_body*)new_hdr->parsed)->number.s =  translate_pointer( new_msg->buf , org_msg->buf , ((struct cseq_body*)hdr->parsed)->number.s );
+                   ((struct cseq_body*)new_hdr->parsed)->method.s =  translate_pointer( new_msg->buf , org_msg->buf , ((struct cseq_body*)hdr->parsed)->method.s );
+                   new_msg->cseq = new_hdr;
+                   break;
+         case HDR_CALLID:
+                   new_msg->callid = new_hdr;
+                   break;
+         case HDR_TO:
+                   new_msg->to = new_hdr;
+                   break;
+         case HDR_FROM:
+                   new_msg->from = new_hdr;
+                   break;
+         case HDR_CONTACT:
+                   new_msg->contact = new_hdr;
+                   break;
+      }
+
+     if ( last_hdr )
+      {
+          last_hdr->next = new_hdr;
+          last_hdr=last_hdr->next;
+      }
+      else
+      {
+           last_hdr=new_hdr;
+           new_msg->headers =new_hdr;
+      }
+      last_hdr->next = 0;
+      new_msg->last_header = last_hdr;
+   
+   }
+
+
+   return new_msg;
+}
+
+
+
+struct via_body* via_body_cloner_2( char* new_buf , char *org_buf , struct via_body *org_via, char **p)
+{
+    struct via_body *new_via;
+
+    /* clones the via_body structure */
+    new_via = (struct via_body*)(*p);
+    memcpy( new_via , org_via , sizeof( struct via_body) );
+    (*p) += sizeof( struct via_body );
+
+    /* hdr (str type) */
+    new_via->hdr.s = translate_pointer( new_buf , org_buf , org_via->hdr.s );
+    /* name (str type) */
+    new_via->name.s = translate_pointer( new_buf , org_buf , org_via->name.s );
+    /* version (str type) */
+    new_via->version.s = translate_pointer( new_buf , org_buf , org_via->version.s );
+    /* transport (str type) */
+    new_via->transport.s = translate_pointer( new_buf , org_buf , org_via->transport.s );
+    /* host (str type) */
+    new_via->host.s = translate_pointer( new_buf , org_buf , org_via->host.s );
+    /* port_str (str type) */
+    new_via->port_str.s = translate_pointer( new_buf , org_buf , org_via->port_str.s );
+    /* params (str type) */
+    new_via->params.s = translate_pointer( new_buf , org_buf , org_via->params.s );
+    /* comment (str type) */
+    new_via->comment.s = translate_pointer( new_buf , org_buf , org_via->comment.s );
+
+
+    if ( org_via->param_lst )
+    {
+       struct via_param *vp, *new_vp, *last_new_vp;
+       for( vp=org_via->param_lst, last_new_vp=0 ; vp ; vp=vp->next )
+       {
+           new_vp = (struct via_param*)(*p);
+           memcpy( new_vp , vp , sizeof(struct via_param));
+           (*p) += sizeof(struct via_param);
+           new_vp->name.s = translate_pointer( new_buf , org_buf , vp->name.s );
+           new_vp->value.s = translate_pointer( new_buf , org_buf , vp->value.s );
+
+           if (new_vp->type==PARAM_BRANCH)
+              new_via->branch = new_vp;
+
+           if (last_new_vp)
+              last_new_vp->next = new_vp;
+           else
+              new_via->param_lst = new_vp;
+
+           last_new_vp = new_vp;
+           last_new_vp->next = NULL;
+       }
+       new_via->last_param = new_vp;
+    }
+
+
+   if ( org_via->next )
+       new_via->next = via_body_cloner_2( new_buf , org_buf , org_via->next , p );
+
+   return new_via;
+}
+
+
+
+
+
+
+
+void sip_msg_free_2(struct sip_msg* msg)
+{
+   sh_free( (char*)msg );
 }
 
 

modules/tm/sip_msg.h

@@ -11,10 +11,10 @@
 #include "sh_malloc.h"
 
 #define sip_msg_cloner(p_msg) \
-    sip_msg_cloner_1(p_msg)
+    sip_msg_cloner_2(p_msg)
 
 #define sip_msg_free(p_msg) \
-    sip_msg_free_1(p_msg)
+    sip_msg_free_2(p_msg)
 
 
 struct sip_msg*  sip_msg_cloner_1( struct sip_msg *org_msg );
@@ -22,8 +22,5 @@ struct sip_msg*  sip_msg_cloner_2( struct sip_msg *org_msg );
 void                     sip_msg_free_1( struct sip_msg *org_msg );
 void                     sip_msg_free_2( struct sip_msg *org_msg );
 
-char*   translate_pointer( char* new_buf , char *org_buf , char* p);
-struct via_body* via_body_cloner( char* new_buf , char *org_buf , struct via_body *org_via);
-struct hdr_field* header_cloner( struct sip_msg *new_msg , struct sip_msg *org_msg, struct hdr_field *hdr);
 
 #endif

t_debug.cfg

@@ -1,4 +1,4 @@
-debug=3          # debug level (cmd line: -dddddddddd)
+debug=9          # debug level (cmd line: -dddddddddd)
 check_via=yes     # (cmd. line: -v)
 dns=on           # (cmd. line: -r)
 rev_dns=yes      # (cmd. line: -R)
@@ -12,13 +12,13 @@ loop_checks=1
 
 #modules
 loadmodule "modules/print/print.so"
-#loadmodule "modules/tm/tm.so"
+loadmodule "modules/tm/tm.so"
 
 route{
 	if ( t_lookup_request()) {
 		if ( method=="ACK" )	{
 			log("SER: ACK received -> t_release\n");
-			if (! t_forward("195.37.78.233", "6666" )) {
+			if (! t_forward("iptel.org", "5060" )) {
 				log("SER: WARNING: bad forward\n");
 			};
 			if (! t_release()) {
@@ -34,9 +34,9 @@ route{
 		if (! t_add_transaction()){
 			log("ERROR in ser: t_add_transaction\n");
 			if (method=="BYE") {
-				forward("195.37.78.233", 5555);
+				forward("iptel.org", 5060);
 			}else{
-				forward("195.37.78.233", 6666 );
+				forward("iptel.org", 5060 );
 			};
 		} else {
 			if (method=="CANCEL") {
@@ -53,11 +53,11 @@ route{
 			};
 			if (method=="BYE") {
 				log("SER: BYE received, HACK: forwarding to client\n");
-				if (! t_forward("195.37.78.233", "5555")){
+				if (! t_forward("iptel.org", "5060")){
 					log("SER:ERROR: t_forward (..., 5555)\n");
 				};
 			}else{
-				if (! t_forward("195.37.78.233", "6666" )){
+				if (! t_forward("iptel.org", "5060" )){
 					log("SER:ERROR: t_forward (..., 6666)\n");
 				};
 			};