PN Support: Improve default handling for failed calls

Avoid relying on the "fr_inv_timeout" by default in order to complete
the transaction when the call is rejected (wait_for_new_branches...), as
the default (120s) is quite high, and can lead to stalling INVITEs.

(cherry picked from commit 45dcfd7)

Author: liviuchircu

lib/reg/pn.c

@@ -625,7 +625,7 @@ int pn_awake_pn_contacts(struct sip_msg *req, ucontact_t **cts, int sz)
 		return -1;
 	}
 
-	if (tmb.t_wait_for_new_branches(req) != 1)
+	if (tmb.t_wait_for_new_branches(req, (unsigned int)sz) != 1)
 		LM_ERR("failed to enable waiting for new branches\n");
 
 	for (end = cts + sz; cts < end; cts++) {

modules/tm/t_fwd.h

@@ -58,8 +58,7 @@ struct script_route_ref *get_on_branch();
 typedef int (*tgetbranch_f)(void);
 int get_branch_index(void);
 
-extern int w_t_wait_for_new_branches(struct sip_msg* msg);
-
+extern int w_t_wait_for_new_branches(struct sip_msg* msg, unsigned int br_to_wait);
 extern int w_t_inject_branches(struct sip_msg* msg, void *source,
                                void *extra_flags);
 int t_inject_ul_event_branch(void);

modules/tm/tm.c

@@ -1711,9 +1711,9 @@ int w_t_inject_branches(struct sip_msg* msg, void *source, void *extra_flags)
 }
 
 
-int w_t_wait_for_new_branches(struct sip_msg* msg)
+int w_t_wait_for_new_branches(struct sip_msg* msg, unsigned int br_to_wait)
 {
-	return t_wait_for_new_branches(msg, 0);
+	return t_wait_for_new_branches(msg, &br_to_wait);
 }
 
 

modules/tm/tm_load.h

@@ -96,8 +96,15 @@ struct tm_binds {
 	set_localT_holder_f setlocalTholder;
 	tgetbranch_f       get_branch_index;
 
-	/* Return: 1 on success, -1 otherwise */
-	int (*t_wait_for_new_branches) (struct sip_msg *msg);
+	/**
+	 * Keep the transaction in an unresolved state (no final response), even if
+	 * all pending branches are completed.  The transaction will then complete
+	 * when either the specified @num_br number of branches have completed, or
+	 * if it times out.
+	 *
+	 * Return: 1 on success, -1 otherwise
+	 */
+	int (*t_wait_for_new_branches) (struct sip_msg *msg, unsigned int num_br);
 
 	/**
 	 * Injects and relays a new branch for the current transaction using the