- fixed CANCEL matching in B2B

modules/b2b_entities/dlg.c

@@ -635,7 +635,7 @@ int b2b_prescript_f(struct sip_msg *msg, void *uparam)
 	/* if a CANCEL request - search iteratively in the server_htable*/
 	if(method_value == METHOD_CANCEL)
 	{
-		str ruri= msg->first_line.u.request.uri;
+		/*str ruri= msg->first_line.u.request.uri;*/
 		str reply_text={"canceling", 9};
 		/* This makes no sense - why not accepting a CANCEL that was
 		   generated by other b2b instance ? or ourselves ? - bogdan
@@ -647,7 +647,12 @@ int b2b_prescript_f(struct sip_msg *msg, void *uparam)
 		*/
 
 		hash_index = core_hash(&callid, &from_tag, server_hsize);
-		dlg = b2bl_search_iteratively(&callid, &from_tag, &ruri, hash_index);
+		/* As per RFC3261, the RURI must be used when matching the CANCEL
+		   against the INVITE, but we should not do it here as B2B learns
+		   a RURI that may have been changed in script (before invoking the
+		   B2B module), while the CANCEL has the original RURI (as received)
+		*/
+		dlg = b2bl_search_iteratively(&callid, &from_tag, NULL/*&ruri*/, hash_index);
 		if(dlg == NULL)
 		{
 			lock_release(&server_htable[hash_index].lock);