[Pkg-voip-commits] r7421 - in /yxa/trunk/debian: changelog patches/loop_fix_orig_uri.dpatch

[mikma-guest at alioth.debian.org]

Author: mikma-guest
Date: Thu Jul 16 20:46:37 2009
New Revision: 7421

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7421
Log:
Update test case after changes of loop detection.

Modified:
    yxa/trunk/debian/changelog
    yxa/trunk/debian/patches/loop_fix_orig_uri.dpatch

Modified: yxa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/changelog?rev=7421&op=diff
==============================================================================
--- yxa/trunk/debian/changelog (original)
+++ yxa/trunk/debian/changelog Thu Jul 16 20:46:37 2009
@@ -13,5 +13,6 @@
   * Fix build eldap error.
   * Fix CANCEL Via transport matching.
   * Fix Re-SUBSCRIBE handling in eventserver.
+  * Update test case after changes of loop detection.
 
- -- Mikael Magnusson <mikma at users.sourceforge.net>  Thu, 25 Jun 2009 22:14:02 +0200
+ -- Mikael Magnusson <mikma at users.sourceforge.net>  Thu, 16 Jul 2009 22:46:04 +0200

Modified: yxa/trunk/debian/patches/loop_fix_orig_uri.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/loop_fix_orig_uri.dpatch?rev=7421&op=diff
==============================================================================
--- yxa/trunk/debian/patches/loop_fix_orig_uri.dpatch (original)
+++ yxa/trunk/debian/patches/loop_fix_orig_uri.dpatch Thu Jul 16 20:46:37 2009
@@ -6,9 +6,9 @@
 ## DP: transportlayer:send_proxy_request/4.
 
 @DPATCH@
-diff -urNad yxa-1.0+20080221svn~/src/sippipe.erl yxa-1.0+20080221svn/src/sippipe.erl
---- yxa-1.0+20080221svn~/src/sippipe.erl	2008-02-20 09:39:12.000000000 +0100
-+++ yxa-1.0+20080221svn/src/sippipe.erl	2009-03-15 11:47:44.000000000 +0100
+diff -urNad yxa-1.0+20090326~/src/sippipe.erl yxa-1.0+20090326/src/sippipe.erl
+--- yxa-1.0+20090326~/src/sippipe.erl	2009-07-16 22:39:06.000000000 +0200
++++ yxa-1.0+20090326/src/sippipe.erl	2009-07-16 22:40:07.000000000 +0200
 @@ -124,7 +124,7 @@
  	    transactionlayer:send_response_handler(ServerHandler, 500, "Destination unreachable"),
  	    error;
@@ -27,9 +27,35 @@
  		    %% Figure out what timeout to use. To not get stuck on a single destination, we divide the
  		    %% total ammount of time we have at our disposal with the number of remaining destinations
  		    %% that we might try. This might not be the ideal algorithm for this, but it is better than
-diff -urNad yxa-1.0+20080221svn~/src/sipproxy.erl yxa-1.0+20080221svn/src/sipproxy.erl
---- yxa-1.0+20080221svn~/src/sipproxy.erl	2007-10-17 16:30:33.000000000 +0200
-+++ yxa-1.0+20080221svn/src/sipproxy.erl	2009-03-15 11:47:44.000000000 +0100
+@@ -790,6 +790,7 @@
+     autotest:mark(?LINE, "get_next_client_transaction_params/2 - 3.0"),
+     %% test working case
+     GNCTP_NewURL3 = sipurl:parse("sip:new.example.org"),
++    GNCTP_OldURL3 = sipurl:parse("sip:old.example.org"),
+     GNCTP_DstL_3 =
+ 	[#sipdst{proto = yxa_test, addr = "failed dst"},
+ 	 #sipdst{proto = yxa_test,
+@@ -803,7 +804,7 @@
+ 	       approxmsgsize	= 500,
+ 	       branch		= "foo.1",
+ 	       request		= #request{method = "TEST",
+-					   uri    = sipurl:parse("sip:old.example.org")
++					   uri    = GNCTP_OldURL3
+ 					  },
+ 	       endtime		= util:timestamp() + 10
+ 	      },
+@@ -812,7 +813,7 @@
+     GNCTP_Res3 = get_next_client_transaction_params(400, GNCTP_State3),
+ 
+     autotest:mark(?LINE, "get_next_client_transaction_params/2 - 3.2"),
+-    {ok, #request{uri = GNCTP_NewURL3}, #sipdst{addr = "192.0.2.3", port = 4997},
++    {ok, #request{uri = GNCTP_OldURL3}, #sipdst{addr = "192.0.2.3", port = 4997},
+      GNCTP_Timeout3, GNCTP_State3_Res} = GNCTP_Res3,
+     "foo.2" = GNCTP_State3_Res#state.branch,
+     {timeout, true} = {timeout, (GNCTP_Timeout3 >= 9 andalso GNCTP_Timeout3 =< 10)},
+diff -urNad yxa-1.0+20090326~/src/sipproxy.erl yxa-1.0+20090326/src/sipproxy.erl
+--- yxa-1.0+20090326~/src/sipproxy.erl	2009-07-16 22:39:06.000000000 +0200
++++ yxa-1.0+20090326/src/sipproxy.erl	2009-07-16 22:39:18.000000000 +0200
 @@ -404,7 +404,7 @@
      DstList = sipdst:url_to_dstlist(DstURI, ApproxMsgSize, URI),