Jan Janak пре 20 година
родитељ
комит
9648ac53ad
5 измењених фајлова са 8 додато и 8 уклоњено
  1. 1 1
      modules/tm/h_table.c
  2. 1 1
      modules/tm/h_table.h
  3. 1 1
      modules/tm/t_funcs.c
  4. 2 2
      modules/tm/t_lookup.c
  5. 3 3
      modules/tm/t_reply.c

+ 1 - 1
modules/tm/h_table.c

@@ -268,7 +268,7 @@ struct cell*  build_cell( struct sip_msg* p_msg )
 	/* UAC */
 	/* UAC */
 	init_branches(new_cell);
 	init_branches(new_cell);
 
 
-	new_cell->relaied_reply_branch   = -1;
+	new_cell->relayed_reply_branch   = -1;
 	/* new_cell->T_canceled = T_UNDEFINED; */
 	/* new_cell->T_canceled = T_UNDEFINED; */
 #ifdef EXTRA_DEBUG
 #ifdef EXTRA_DEBUG
 	new_cell->wait_tl.tg=TG_WT;
 	new_cell->wait_tl.tg=TG_WT;

+ 1 - 1
modules/tm/h_table.h

@@ -225,7 +225,7 @@ typedef struct cell
 	int nr_of_outgoings;
 	int nr_of_outgoings;
 	/* nr of replied branch; 0..MAX_BRANCHES=branch value,
 	/* nr of replied branch; 0..MAX_BRANCHES=branch value,
 	 * -1 no reply, -2 local reply */
 	 * -1 no reply, -2 local reply */
-	int relaied_reply_branch;
+	int relayed_reply_branch;
 	/* UA Server */
 	/* UA Server */
 	struct ua_server  uas;
 	struct ua_server  uas;
 	/* UA Clients */
 	/* UA Clients */

+ 1 - 1
modules/tm/t_funcs.c

@@ -243,7 +243,7 @@ int t_relay_to( struct sip_msg  *p_msg , struct proxy_l *proxy, int proto,
 	}
 	}
 
 
 	/* if replication flag is set, mark the transaction as local
 	/* if replication flag is set, mark the transaction as local
-	   so that replies will not be relaied */
+	   so that replies will not be relayed */
 	t=get_t();
 	t=get_t();
 	if (replicate) t->flags|=T_IS_LOCAL_FLAG;
 	if (replicate) t->flags|=T_IS_LOCAL_FLAG;
 
 

+ 2 - 2
modules/tm/t_lookup.c

@@ -237,7 +237,7 @@ static inline int ack_matching(struct cell *p_cell, struct sip_msg *p_msg)
 	 * done now -- we ignore to-tags; the ACK simply belongs to
 	 * done now -- we ignore to-tags; the ACK simply belongs to
 	 * this UAS part of dialog, whatever to-tag it gained
 	 * this UAS part of dialog, whatever to-tag it gained
 	 */
 	 */
-	if (p_cell->relaied_reply_branch!=-2) {
+	if (p_cell->relayed_reply_branch!=-2) {
 		return 2; /* e2e proxied ACK */
 		return 2; /* e2e proxied ACK */
 	}
 	}
 	/* it's a local dialog -- we wish to verify to-tags too */
 	/* it's a local dialog -- we wish to verify to-tags too */
@@ -489,7 +489,7 @@ int t_lookup_request( struct sip_msg* p_msg , int leave_new_locked )
 			/* it is e2e ACK/200 */
 			/* it is e2e ACK/200 */
 			if (p_cell->uas.status<300 && e2e_ack_trans==0) {
 			if (p_cell->uas.status<300 && e2e_ack_trans==0) {
 				/* all criteria for proxied ACK are ok */
 				/* all criteria for proxied ACK are ok */
-				if (p_cell->relaied_reply_branch!=-2) {
+				if (p_cell->relayed_reply_branch!=-2) {
 					e2e_ack_trans=p_cell;
 					e2e_ack_trans=p_cell;
 					continue;
 					continue;
 				}
 				}

+ 3 - 3
modules/tm/t_reply.c

@@ -384,7 +384,7 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len,
 	   on current transactions status */
 	   on current transactions status */
 	/* t_update_timers_after_sending_reply( rb ); */
 	/* t_update_timers_after_sending_reply( rb ); */
 	update_reply_stats( code );
 	update_reply_stats( code );
-	trans->relaied_reply_branch=-2;
+	trans->relayed_reply_branch=-2;
 	tm_stats->replied_localy++;
 	tm_stats->replied_localy++;
 	if (lock) UNLOCK_REPLIES( trans );
 	if (lock) UNLOCK_REPLIES( trans );
 	
 	
@@ -943,7 +943,7 @@ void set_final_timer( /* struct s_table *h_table, */ struct cell *t )
 			return;
 			return;
 		}
 		}
 		/* local UAS retransmits too */
 		/* local UAS retransmits too */
-		if (t->relaied_reply_branch==-2 && t->uas.status>=200) {
+		if (t->relayed_reply_branch==-2 && t->uas.status>=200) {
 			/* we retransmit 200/INVs regardless of transport --
 			/* we retransmit 200/INVs regardless of transport --
 			   even if TCP used, UDP could be used upstream and
 			   even if TCP used, UDP could be used upstream and
 			   loose the 200, which is not retransmitted by proxies
 			   loose the 200, which is not retransmitted by proxies
@@ -1112,7 +1112,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch,
 
 
 		/* update the status ... */
 		/* update the status ... */
 		t->uas.status = relayed_code;
 		t->uas.status = relayed_code;
-		t->relaied_reply_branch = relay;
+		t->relayed_reply_branch = relay;
 
 
 		if (is_invite(t) && relayed_msg!=FAKED_REPLY
 		if (is_invite(t) && relayed_msg!=FAKED_REPLY
 		&& relayed_code>=200 && relayed_code < 300
 		&& relayed_code>=200 && relayed_code < 300