From dc20729c90fb0e0dae24f11a8f718573a6f69fa7 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 22 Nov 2017 13:21:38 +0100
Subject: [PATCH] fix tester: Flexisip.Subscribe Notify with sipp publisher

---
 tester/complex_sip_case_tester.c | 4 ++--
 tester/sipp/simple_publish.xml   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tester/complex_sip_case_tester.c b/tester/complex_sip_case_tester.c
index da16a595b..fc2ad0c43 100644
--- a/tester/complex_sip_case_tester.c
+++ b/tester/complex_sip_case_tester.c
@@ -112,8 +112,8 @@ LinphoneAddress * linphone_core_manager_resolve(LinphoneCoreManager *mgr, const
 	 ,&addrinfo);
 
 	 dest=linphone_address_new(NULL);
-
-	 wait_for(mgr->lc, mgr->lc, (int*)&addrinfo, 1);
+	 
+	 wait_for_until(mgr->lc, mgr->lc, (int*)&addrinfo, 1,2000);
 	 err=bctbx_getnameinfo((struct sockaddr*)addrinfo->ai_addr,addrinfo->ai_addrlen,ipstring,INET6_ADDRSTRLEN,NULL,0,NI_NUMERICHOST);
 	 if (err !=0 ){
 		 ms_error("linphone_core_manager_resolve(): getnameinfo error %s", gai_strerror(err));
diff --git a/tester/sipp/simple_publish.xml b/tester/sipp/simple_publish.xml
index 4040471ce..7b0ddfda2 100644
--- a/tester/sipp/simple_publish.xml
+++ b/tester/sipp/simple_publish.xml
@@ -38,10 +38,11 @@
       Content-Length: [len]
 
       <?xml version="1.0" encoding="UTF-8"?>
-      <presence xmlns:dm="urn:ietf:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:params:xml:ns:pidf:rpid" entity="sip:[service]@sip.example.org" xmlns="urn:ietf:params:xml:ns:pidf">
+      <presence xmlns:dm="urn:ietf:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:params:xml:ns:pidf:rpid"  xmlns:pidfonline="http://www.linphone.org/xsds/pidfonline.xsd" entity="sip:[service]@sip.example.org" xmlns="urn:ietf:params:xml:ns:pidf">
             <tuple id="jjlson">
                   <status>
                         <basic>open</basic>
+			 <pidfonline:online/>
                   </status>
                   <contact priority="0.8">sip:[service]@[local_ip]:[local_port]</contact>
                   <timestamp>2015-09-28T15:49:00Z</timestamp>
@@ -74,10 +75,11 @@
       Content-Length: [len]
 
       <?xml version="1.0" encoding="UTF-8"?>
-      <presence xmlns:dm="urn:ietf:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:params:xml:ns:pidf:rpid" entity="sip:[service]@sip.example.org" xmlns="urn:ietf:params:xml:ns:pidf">
+      <presence xmlns:dm="urn:ietf:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:params:xml:ns:pidf:rpid"  xmlns:pidfonline="http://www.linphone.org/xsds/pidfonline.xsd" entity="sip:[service]@sip.example.org" xmlns="urn:ietf:params:xml:ns:pidf">
             <tuple id="jjlson">
                   <status>
                         <basic>open</basic>
+			<pidfonline:online/>
                   </status>
                   <contact priority="0.8">sip:[service]@[local_ip]:[local_port]</contact>
                   <timestamp>2015-09-28T15:49:00Z</timestamp>