浏览代码

damocles aborts returned to be more strict

Jiri Kuthan 22 年之前
父节点
当前提交
1bb7bec8b4
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 1 1
      modules/tm/t_lookup.c
  2. 3 3
      modules/tm/timer.c

+ 1 - 1
modules/tm/t_lookup.c

@@ -867,7 +867,7 @@ int t_check( struct sip_msg* p_msg , int *param_branch )
 
 		}
 #ifdef EXTRA_DEBUG
-		if ( T && T!=T_UNDEFINED && T->damocles==1) {
+		if ( T && T!=T_UNDEFINED && T->damocles) {
 			LOG( L_ERR, "ERROR: transaction %p scheduled for deletion "
 				"and called from t_check\n", T);
 			abort();

+ 3 - 3
modules/tm/timer.c

@@ -266,7 +266,7 @@ inline static void retransmission_handler( void *attr)
 
 	r_buf = (struct retr_buf*)attr;
 #ifdef EXTRA_DEBUG
-	if (r_buf->my_T->damocles==1) {
+	if (r_buf->my_T->damocles) {
 		LOG( L_ERR, "ERROR: transaction %p scheduled for deletion and"
 			" called from RETR timer\n",r_buf->my_T);
 		abort();
@@ -313,7 +313,7 @@ inline static void final_response_handler( void *attr)
 	t=r_buf->my_T;
 
 #	ifdef EXTRA_DEBUG
-	if (t->damocles==1) 
+	if (t->damocles) 
 	{
 		LOG( L_ERR, "ERROR: transaction %p scheduled for deletion and"
 			" called from FR timer\n",r_buf->my_T);
@@ -395,7 +395,7 @@ inline static void wait_handler( void *attr)
 	struct cell *p_cell = (struct cell*)attr;
 
 #ifdef EXTRA_DEBUG
-	if (p_cell->damocles==1) {
+	if (p_cell->damocles) {
 		LOG( L_ERR, "ERROR: transaction %p scheduled for deletion and"
 			" called from WAIT timer\n",p_cell);
 		abort();