[tm] fix missing Route hdrs in locally generated ACK/CANCEL

Even if those requests are hop-to-hop (and they do not need Route hdrs), this is valid only for stateful SIP servers. Yes, woow, we need to take care of stateless SIP server :P.
As various module may add lumps with Route hdrs, let's mark this, so we will know later if we should re-parse and check for such Route hdrs (in the outbound buffer)
Closes #3131

(cherry picked from commit 13bd2b8)

modules/dialog/dlg_handlers.c

@@ -2719,6 +2719,7 @@ int fix_route_dialog(struct sip_msg *req,struct dlg_cell *dlg)
 				pkg_free(route);
 				return -1;
 			}
+			req->msg_flags |= FL_HAS_ROUTE_LUMP;
 
 			LM_DBG("Setting route  header to <%s> \n",route);
 
@@ -2812,6 +2813,7 @@ int fix_route_dialog(struct sip_msg *req,struct dlg_cell *dlg)
 					return -1;
 				}
 				free_rr(&head);
+				req->msg_flags |= FL_HAS_ROUTE_LUMP;
 			}
 
 			if (lmp == NULL) {
@@ -2844,6 +2846,7 @@ int fix_route_dialog(struct sip_msg *req,struct dlg_cell *dlg)
 					pkg_free(remote_contact);
 					return -1;
 				}
+				req->msg_flags |= FL_HAS_ROUTE_LUMP;
 			}
 		}
 	}

modules/tm/t_msgbuilder.c

@@ -181,8 +181,8 @@ char *build_local(struct cell *Trans,unsigned int branch,
 
 	/* copy'n'paste Route headers that were sent out */
 	if (is_local(Trans) || (!is_local(Trans) &&
-	( (req && req->route) || /* at least one route was received*/
-	(Trans->uac[branch].path_vec.len!=0))) ) /* path was forced */
+	/* if there was a ROUTE received or added */
+	( req && (req->route || req->msg_flags&FL_HAS_ROUTE_LUMP))) )
 	{
 		buf_hdrs = extract_parsed_hdrs(Trans->uac[branch].request.buffer.s,
 			Trans->uac[branch].request.buffer.len );

modules/topology_hiding/topo_hiding_logic.c

@@ -1956,6 +1956,7 @@ static int topo_no_dlg_seq_handling(struct sip_msg *msg,str *info)
 				LM_ERR("failed inserting new route set\n");
 				goto err_free_route;
 			}
+			msg->msg_flags |= FL_HAS_ROUTE_LUMP;
 
 			LM_DBG("Setting route  header to <%s> \n",route);
 			LM_DBG("setting dst_uri to <%.*s> \n",head->nameaddr.uri.len,
@@ -2017,6 +2018,7 @@ static int topo_no_dlg_seq_handling(struct sip_msg *msg,str *info)
 					LM_ERR("failed inserting new route set\n");
 					goto err_free_route;
 				}
+				msg->msg_flags |= FL_HAS_ROUTE_LUMP;
 			}
 
 			if (lmp == NULL) {
@@ -2049,6 +2051,7 @@ static int topo_no_dlg_seq_handling(struct sip_msg *msg,str *info)
 					pkg_free(remote_contact);
 					goto err_free_head;
 				}
+				msg->msg_flags |= FL_HAS_ROUTE_LUMP;
 			}
 		}
 	}

msg_translator.c

@@ -2073,6 +2073,8 @@ static inline int insert_path_as_route(struct sip_msg* msg, str* path)
 		return -1;
 	}
 
+	msg->msg_flags |= FL_HAS_ROUTE_LUMP;
+
 	return 0;
 }
 

parser/msg_parser.h

@@ -126,6 +126,8 @@ enum request_method {
 #define FL_BODY_NO_SDP       (1<<20) /* message does not have an SDP body */
 #define FL_IS_LOCAL          (1<<21) /* the message is a locally generated
                                       * one, not received */
+#define FL_HAS_ROUTE_LUMP    (1<<22) /* the message had Route headers added
+                                      * as lumps */
 
 /* define the # of unknown URI parameters to parse */
 #define URI_MAX_U_PARAMS 10