瀏覽代碼

- updated all the users of run_actions() or do_action() to the new
interface

Andrei Pelinescu-Onciul 18 年之前
父節點
當前提交
9f2eed8b56
共有 2 個文件被更改,包括 9 次插入3 次删除
  1. 3 1
      modules/tm/t_fwd.c
  2. 6 2
      modules/tm/t_reply.c

+ 3 - 1
modules/tm/t_fwd.c

@@ -142,6 +142,7 @@ static char *print_uac_request( struct cell *t, struct sip_msg *i_req,
 	struct sip_uri parsed_uri_bak;
 	struct sip_uri parsed_uri_bak;
 	int parsed_uri_ok_bak, uri_backed_up;
 	int parsed_uri_ok_bak, uri_backed_up;
 	str msg_uri_bak;
 	str msg_uri_bak;
+	struct run_act_ctx ra_ctx;
 
 
 	shbuf=0;
 	shbuf=0;
 	msg_uri_bak.s=0; /* kill warnings */
 	msg_uri_bak.s=0; /* kill warnings */
@@ -175,7 +176,8 @@ static char *print_uac_request( struct cell *t, struct sip_msg *i_req,
 
 
 	if (unlikely(branch_route)) {
 	if (unlikely(branch_route)) {
 		     /* run branch_route actions if provided */
 		     /* run branch_route actions if provided */
-		if (run_actions(branch_rt.rlist[branch_route], i_req) < 0) {
+		init_run_actions_ctx(&ra_ctx);
+		if (run_actions(&ra_ctx, branch_rt.rlist[branch_route], i_req) < 0) {
 			LOG(L_ERR, "ERROR: print_uac_request: Error in run_actions\n");
 			LOG(L_ERR, "ERROR: print_uac_request: Error in run_actions\n");
                }
                }
 	}
 	}

+ 6 - 2
modules/tm/t_reply.c

@@ -733,6 +733,7 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl,
 	static struct sip_msg faked_req;
 	static struct sip_msg faked_req;
 	struct sip_msg *shmem_msg = t->uas.request;
 	struct sip_msg *shmem_msg = t->uas.request;
 	int on_failure;
 	int on_failure;
+	struct run_act_ctx ra_ctx;
 
 
 	/* failure_route for a local UAC? */
 	/* failure_route for a local UAC? */
 	if (!shmem_msg) {
 	if (!shmem_msg) {
@@ -768,7 +769,8 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl,
 		on_failure = t->on_negative;
 		on_failure = t->on_negative;
 		t->on_negative=0;
 		t->on_negative=0;
 		/* run a reply_route action if some was marked */
 		/* run a reply_route action if some was marked */
-		if (run_actions(failure_rt.rlist[on_failure], &faked_req)<0)
+		init_run_actions_ctx(&ra_ctx);
+		if (run_actions(&ra_ctx, failure_rt.rlist[on_failure], &faked_req)<0)
 			LOG(L_ERR, "ERROR: run_failure_handlers: Error in do_action\n");
 			LOG(L_ERR, "ERROR: run_failure_handlers: Error in do_action\n");
 	}
 	}
 
 
@@ -1621,6 +1623,7 @@ int reply_received( struct sip_msg  *p_msg )
 	avp_list_t* backup_user_from, *backup_user_to;
 	avp_list_t* backup_user_from, *backup_user_to;
 	avp_list_t* backup_domain_from, *backup_domain_to;
 	avp_list_t* backup_domain_from, *backup_domain_to;
 	avp_list_t* backup_uri_from, *backup_uri_to;
 	avp_list_t* backup_uri_from, *backup_uri_to;
+	struct run_act_ctx ra_ctx;
 #ifdef USE_DNS_FAILOVER
 #ifdef USE_DNS_FAILOVER
 	int branch_ret;
 	int branch_ret;
 	int prev_branch;
 	int prev_branch;
@@ -1756,7 +1759,8 @@ int reply_received( struct sip_msg  *p_msg )
 		backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to );
 		backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to );
 		backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from );
 		backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from );
 		backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to );
 		backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to );
-		if (run_actions(onreply_rt.rlist[t->on_reply], p_msg)<0)
+		init_run_actions_ctx(&ra_ctx);
+		if (run_actions(&ra_ctx, onreply_rt.rlist[t->on_reply], p_msg)<0)
 			LOG(L_ERR, "ERROR: on_reply processing failed\n");
 			LOG(L_ERR, "ERROR: on_reply processing failed\n");
 		/* transfer current message context back to t */
 		/* transfer current message context back to t */
 		if (t->uas.request) t->uas.request->flags=p_msg->flags;
 		if (t->uas.request) t->uas.request->flags=p_msg->flags;