فهرست منبع

*** empty log message ***

Bogdan-Andrei Iancu 23 سال پیش
والد
کامیت
ce4703181f
3فایلهای تغییر یافته به همراه17 افزوده شده و 20 حذف شده
  1. 8 8
      modules/tm/sip_msg.c
  2. 5 8
      modules/tm/t_funcs.c
  3. 4 4
      test/th-uri.cfg

+ 8 - 8
modules/tm/sip_msg.c

@@ -76,7 +76,7 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
                    break;
       }
    }
-   /* length of the data lump structures */
+   /* length of the data lump structures
    if (org_msg->first_line.type==SIP_REQUEST)
       lump_chain = org_msg->add_rm;
    else
@@ -99,9 +99,9 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
       lump_chain = lump_chain->next;
    }
 
-   /*length of reply lump structures*/
+   /*length of reply lump structures/
    for(rpl_lump=org_msg->reply_lump;rpl_lump;rpl_lump=rpl_lump->next)
-       len+=rpl_lump->text.len;
+       len+=rpl_lump->text.len;*/
 
    p=(char *)sh_malloc(len);foo=p;
    if (!p)
@@ -261,7 +261,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) {
       lump_chain = org_msg->add_rm;
       lump_anchor = &(new_msg->add_rm);
@@ -272,7 +272,7 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
    while (lump_chain)
    {
       lump_clone( (*lump_anchor) , lump_chain , p );
-      /*before list*/
+      /*before list/
       lump_tmp = lump_chain->before;
       lump_anchor2 = &((*lump_anchor)->before);
       while ( lump_tmp )
@@ -281,7 +281,7 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
          lump_anchor2 = &((*lump_anchor2)->before);
          lump_tmp = lump_tmp->before;
       }
-      /*after list*/
+      /*after list/
       lump_tmp = lump_chain->after;
       lump_anchor2 = &((*lump_anchor)->after);
       while ( lump_tmp )
@@ -294,7 +294,7 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
       lump_chain = lump_chain->next;
    }
 
-   /*cloning reply lump structures*/
+   /*cloning reply lump structures/
    rpl_lump_anchor = &(new_msg->reply_lump);
    for(rpl_lump=org_msg->reply_lump;rpl_lump;rpl_lump=rpl_lump->next)
    {
@@ -306,7 +306,7 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
        memcpy((*rpl_lump_anchor)->text.s,rpl_lump->text.s,rpl_lump->text.len);
        (*rpl_lump_anchor)->next=0;
        rpl_lump_anchor = &((*rpl_lump_anchor)->next);
-   }
+   }*/
     DBG("DEBUG:cloner --------<%d>---------<%d>-------------\n",len,p-foo);
    return new_msg;
 }

+ 5 - 8
modules/tm/t_funcs.c

@@ -66,26 +66,23 @@ static inline void reset_retr_timers( struct s_table *h_table,
 	DBG("DEBUG:stop_RETR_and_FR_timers : start \n");
 	/* lock the first timer list of the FR group -- all other
 	   lists share the same lock*/
-	lock(  hash_table->timers[FR_TIMER_LIST].mutex );
-	/* reset_timer( h_table, &(p_cell->outbound_response.retr_timer)); */
+	lock(  hash_table->timers[RT_T1_TO_1].mutex );
 	remove_timer_unsafe( & p_cell->outbound_response.retr_timer );
 	for( ijk=0 ; ijk<(p_cell)->nr_of_outgoings ; ijk++ )  {
 			if ( rb = p_cell->outbound_request[ijk] ) {
-				/* reset_timer(h_table, &(rb->retr_timer)); */
 				remove_timer_unsafe( & rb->retr_timer );
 			}
 		}
-	unlock(  hash_table->timers[FR_TIMER_LIST].mutex );
-	lock(  hash_table->timers[RT_T1_TO_1].mutex );
-	/* reset_timer( h_table, &(p_cell->outbound_response.fr_timer)); */
+	unlock(  hash_table->timers[RT_T1_TO_1].mutex );
+
+	lock(  hash_table->timers[FR_TIMER_LIST].mutex );
 	remove_timer_unsafe( & p_cell->outbound_response.fr_timer );
 	for( ijk=0 ; ijk<(p_cell)->nr_of_outgoings ; ijk++ )  {
 			if ( rb = p_cell->outbound_request[ijk] ) {
-				/* reset_timer(h_table, &(rb->fr_timer)); */
 				remove_timer_unsafe( & rb->fr_timer );
 			}
 		}
-	unlock(  hash_table->timers[RT_T1_TO_1].mutex );
+	unlock(  hash_table->timers[FR_TIMER_LIST].mutex );
 	DBG("DEBUG:stop_RETR_and_FR_timers : stop\n");
 }
 

+ 4 - 4
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=no
 log_stderror=yes # (cmd line: -E)
@@ -17,7 +17,7 @@ check_via=no     # (cmd. line: -v)
 dns=off           # (cmd. line: -r)
 rev_dns=off      # (cmd. line: -R)
 #port=5070
-listen=10.0.0.179
+#listen=10.0.0.179
 #listen=192.168.57.33
 loop_checks=0
 # for more info: sip_router -h
@@ -51,7 +51,7 @@ route{
              };
 
 
-
+             /*
              if (method=="INVITE")
              {
                 log("SER : runing CPL!! :)\n");
@@ -70,7 +70,7 @@ route{
                        drop();
                    };
                 };
-             }; 
+             }; */
 
            #  if ( !rewriteFromRoute() )
             # {