Merge branch 'master' of ssh://[email protected]/sip-router

* 'master' of ssh://[email protected]/sip-router:
  refine registrar tests, bug #2790184, port from kamailio r5837

test/unit/11.cfg

@@ -21,7 +21,6 @@ loadmodule "usrloc"
 modparam("usrloc", "db_mode", 1)
 
 loadmodule "registrar"
-modparam("registrar", "reg_callid_avp", "$avp(s:foobar)")
 modparam("registrar", "min_expires", 5)
 modparam("usrloc", "timer_interval", 2)
 
@@ -61,11 +60,6 @@ route{
 			sl_send_reply("404", "Not Found");
 			exit;
 		}
-		$avp(s:foobar) = $ci + "bar";
-#		$avp(s:foobar) = $ci;
-		if (registered("location")) {
-			xlog("already registered");
-		}
 		append_hf("P-hint: usrloc applied\r\n");
 	}
 

test/unit/19.cfg

@@ -17,8 +17,10 @@ loadmodule "registrar/registrar.so"
 loadmodule "sl/sl.so"
 loadmodule "tm/tm.so"
 loadmodule "maxfwd/maxfwd.so"
+loadmodule "pv/pv.so"
 #for debugging purposes only
 loadmodule "mi_fifo/mi_fifo.so"
+loadmodule "xlog/xlog.so"
 
 
 #-----------------------Module parameters-------------------------------------
@@ -33,6 +35,11 @@ route{
 		exit();
 	}
 
+	if (registered("location")) {
+		xlog("contact registered");
+	}
+
+
 	if(!lookup ("location")){
 		sl_send_reply("404", "Not Found");
 	}