Browse Source

*** empty log message ***

Bogdan-Andrei Iancu 23 years ago
parent
commit
ea1048256c
3 changed files with 20 additions and 20 deletions
  1. 3 3
      Makefile.defs
  2. 12 12
      modules/tm/sip_msg.c
  3. 5 5
      test/th-uri.cfg

+ 3 - 3
Makefile.defs

@@ -53,7 +53,7 @@ ARCH = $(shell uname -s)
 
 
 DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
 DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
 	 -DDNS_IP_HACK  -DPKG_MALLOC -DSHM_MEM  -DSHM_MMAP \
 	 -DDNS_IP_HACK  -DPKG_MALLOC -DSHM_MEM  -DSHM_MMAP \
-	 -DUSE_SYNONIM \
+	 -DUSE_SYNONIM -DVQ_MALLOC\
 	 #-DFAST_LOCK -Di386
 	 #-DFAST_LOCK -Di386
 	 #-DBRUT_HACK #-DEXTRA_DEBUG #-DSTATIC_TM
 	 #-DBRUT_HACK #-DEXTRA_DEBUG #-DSTATIC_TM
 	#-DEXTRA_DEBUG -DBRUT_HACK \
 	#-DEXTRA_DEBUG -DBRUT_HACK \
@@ -68,8 +68,8 @@ DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
 #-DNO_LOG
 #-DNO_LOG
 
 
 PROFILE=  -pg #set this if you want profiling
 PROFILE=  -pg #set this if you want profiling
-mode = debug
-#mode = release
+#mode = debug
+mode = release
 
 
 # platform dependent settings
 # platform dependent settings
 
 

+ 12 - 12
modules/tm/sip_msg.c

@@ -10,7 +10,7 @@
 #include "../../ut.h"
 #include "../../ut.h"
 
 
 
 
-#define ROUND4(s) ((s)%4)?((s)+4)/4*4:(s)
+#define ROUND4(s) (((s)%4)?((s)+4)/4*4:(s))
 
 
 #define  lump_len( _lump)  (ROUND4(sizeof(struct lump)) + \
 #define  lump_len( _lump)  (ROUND4(sizeof(struct lump)) + \
                ROUND4( ((_lump)->op==LUMP_ADD)?(_lump)->len:0 ))
                ROUND4( ((_lump)->op==LUMP_ADD)?(_lump)->len:0 ))
@@ -36,7 +36,7 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
    struct to_param   *to_prm,*new_to_prm;
    struct to_param   *to_prm,*new_to_prm;
    struct sip_msg     *new_msg;
    struct sip_msg     *new_msg;
    struct lump          *lump_chain, *lump_tmp, **lump_anchor, **lump_anchor2;
    struct lump          *lump_chain, *lump_tmp, **lump_anchor, **lump_anchor2;
-   char                       *p;
+   char                       *p,*foo;
 
 
 
 
    /*computing the length of entire sip_msg structure*/
    /*computing the length of entire sip_msg structure*/
@@ -74,7 +74,7 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
                    break;
                    break;
       }
       }
    }
    }
-   /* length of the data lump structures
+   /* length of the data lump structures */
    if (org_msg->first_line.type==SIP_REQUEST)
    if (org_msg->first_line.type==SIP_REQUEST)
       lump_chain = org_msg->add_rm;
       lump_chain = org_msg->add_rm;
    else
    else
@@ -95,9 +95,9 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
          lump_tmp = lump_tmp->after;
          lump_tmp = lump_tmp->after;
       }
       }
       lump_chain = lump_chain->next;
       lump_chain = lump_chain->next;
-   }  */
+   }
 
 
-   p=(char *)sh_malloc(len);
+   p=(char *)sh_malloc(len);foo=p;
    if (!p)
    if (!p)
    {
    {
       LOG(L_ERR , "ERROR: sip_msg_cloner_2: cannot allocate memory\n" );
       LOG(L_ERR , "ERROR: sip_msg_cloner_2: cannot allocate memory\n" );
@@ -123,9 +123,9 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
    p += ROUND4(new_msg->len);
    p += ROUND4(new_msg->len);
    /*unparsed and eoh pointer*/
    /*unparsed and eoh pointer*/
    new_msg->unparsed = translate_pointer( new_msg->buf ,
    new_msg->unparsed = translate_pointer( new_msg->buf ,
-							org_msg->buf , org_msg->unparsed );
+	org_msg->buf , org_msg->unparsed );
    new_msg->eoh = translate_pointer( new_msg->buf ,
    new_msg->eoh = translate_pointer( new_msg->buf ,
-							org_msg->buf , org_msg->eoh );
+	org_msg->buf , org_msg->eoh );
    /* first line, updating the pointers*/
    /* first line, updating the pointers*/
    if ( org_msg->first_line.type==SIP_REQUEST )
    if ( org_msg->first_line.type==SIP_REQUEST )
    {
    {
@@ -255,7 +255,7 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
 
 
    }
    }
 
 
-   /* clonning data lump
+   /* clonning data lump*/
    if (org_msg->first_line.type==SIP_REQUEST) {
    if (org_msg->first_line.type==SIP_REQUEST) {
       lump_chain = org_msg->add_rm;
       lump_chain = org_msg->add_rm;
       lump_anchor = &(new_msg->add_rm);
       lump_anchor = &(new_msg->add_rm);
@@ -266,7 +266,7 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
    while (lump_chain)
    while (lump_chain)
    {
    {
       lump_clone( (*lump_anchor) , lump_chain , p );
       lump_clone( (*lump_anchor) , lump_chain , p );
-      /*before list/
+      /*before list*/
       lump_tmp = lump_chain->before;
       lump_tmp = lump_chain->before;
       lump_anchor2 = &((*lump_anchor)->before);
       lump_anchor2 = &((*lump_anchor)->before);
       while ( lump_tmp )
       while ( lump_tmp )
@@ -275,7 +275,7 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
          lump_anchor2 = &((*lump_anchor2)->before);
          lump_anchor2 = &((*lump_anchor2)->before);
          lump_tmp = lump_tmp->before;
          lump_tmp = lump_tmp->before;
       }
       }
-      /*after list/
+      /*after list*/
       lump_tmp = lump_chain->after;
       lump_tmp = lump_chain->after;
       lump_anchor2 = &((*lump_anchor)->after);
       lump_anchor2 = &((*lump_anchor)->after);
       while ( lump_tmp )
       while ( lump_tmp )
@@ -286,8 +286,8 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
       }
       }
       lump_anchor = &((*lump_anchor)->next);
       lump_anchor = &((*lump_anchor)->next);
       lump_chain = lump_chain->next;
       lump_chain = lump_chain->next;
-   }           */
-
+   }
+   DBG("-----------> len=%d <---> written=%d\n",len,p-foo);
    return new_msg;
    return new_msg;
 }
 }
 
 

+ 5 - 5
test/th-uri.cfg

@@ -5,7 +5,7 @@
 #
 #
 
 
 
 
-debug=3          # debug level (cmd line: -dddddddddd)
+debug=9          # debug level (cmd line: -dddddddddd)
 #fork=yes          # (cmd. line: -D)
 #fork=yes          # (cmd. line: -D)
 fork=no
 fork=no
 log_stderror=yes # (cmd line: -E)
 log_stderror=yes # (cmd line: -E)
@@ -17,16 +17,16 @@ check_via=no     # (cmd. line: -v)
 dns=on           # (cmd. line: -r)
 dns=on           # (cmd. line: -r)
 rev_dns=yes      # (cmd. line: -R)
 rev_dns=yes      # (cmd. line: -R)
 #port=5070
 #port=5070
-listen=127.0.0.1
+#listen=127.0.0.1
 #listen=192.168.57.33
 #listen=192.168.57.33
 loop_checks=0
 loop_checks=0
 # for more info: sip_router -h
 # for more info: sip_router -h
 
 
 #modules
 #modules
 #loadmodule "modules/print/print.so"
 #loadmodule "modules/print/print.so"
-#loadmodule "modules/tm/tm.so"
-#loadmodule "modules/rr/rr.so"
-#loadmodule "modules/maxfwd/maxfwd.so"
+loadmodule "modules/tm/tm.so"
+loadmodule "modules/rr/rr.so"
+loadmodule "modules/maxfwd/maxfwd.so"
 
 
 
 
 route{
 route{