From 3c8f207d2f1fc3f73fb1e810488114d9cf1a2aae Mon Sep 17 00:00:00 2001 From: jehan Date: Tue, 9 Sep 2008 19:07:46 +0000 Subject: [PATCH] prepare test call with rtp git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@16 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- .../core/media/rtprelay/RtpRelayService.java | 7 +++--- .../p2pproxy/test/utils/SipClient.java | 25 +++++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/RtpRelayService.java b/p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/RtpRelayService.java index 9929ad496..c1ed12f3d 100644 --- a/p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/RtpRelayService.java +++ b/p2pproxy/src/org/linphone/p2pproxy/core/media/rtprelay/RtpRelayService.java @@ -68,14 +68,15 @@ public class RtpRelayService implements ServiceProvider{ lInputObj = lIn.readObject(); mLog.info("request message ["+lInputObj+"] received"); if (lInputObj instanceof AddressRequest) { - SingleAddressResponse lAddressResponse = new SingleAddressResponse(mConfig.getAudioVideoPublicSocketAddress()); + Map lList = new HashMap(); + lList.put(MediaType.audio, mConfig.getAudioVideoPublicSocketAddress()); + lList.put(MediaType.video, mConfig.getAudioVideoPublicSocketAddress()); + AddressResponse lAddressResponse = new AddressResponse(lList); lOut.writeObject(lAddressResponse); lOut.flush(); } else { mLog.error("unknown request ["+lInputObj+"]"); - } - lStop = true; } } catch (Exception e) { diff --git a/p2pproxy/test-src/org/linphone/p2pproxy/test/utils/SipClient.java b/p2pproxy/test-src/org/linphone/p2pproxy/test/utils/SipClient.java index 82a6bcd2d..22afcac51 100644 --- a/p2pproxy/test-src/org/linphone/p2pproxy/test/utils/SipClient.java +++ b/p2pproxy/test-src/org/linphone/p2pproxy/test/utils/SipClient.java @@ -47,11 +47,9 @@ public class SipClient { +"s=\n" +"c=IN IP4 192.0.2.3\n" +"t=0 0\n" - +"a=ice-pwd:asd88fgpdd777uzjYhagZg\n" - +"a=ice-ufrag:8hhY\n" +"m=audio 45664 RTP/AVP 0\n" +"a=rtpmap:0 PCMU/8000\n" - +"a=candidate:1 1 UDP 2130706431 127.0.0.1 8998 typ host"; + +"a=relay-session-id:toto"; @@ -130,6 +128,14 @@ public class SipClient { * @param should I put an SDP ? */ public void call(String aTo,SipProvider aCalleeProvider,boolean enableSdp) { + call(aTo, aCalleeProvider, enableSdp, 0); + } + /** + * @param aTo uri to call + * @param aProvider sip provider of the To party + * @param should I put an SDP ? + */ + public Call call(String aTo,SipProvider aCalleeProvider,boolean enableSdp,final long aCallDuration) { try { String lCallerUri = mSipIdentity; @@ -161,7 +167,15 @@ public class SipClient { CallListener lCalleeListener = new DefaultCallListener() { public void onCallConfirmed(Call call, String sdp, Message ack) { lCalleeSemaphoreConfirmed.release(); - call.bye(); + if (aCallDuration != Long.MAX_VALUE) { + try { + Thread.sleep(aCallDuration); + } catch (InterruptedException e) { + //nop + } + call.bye(); + } + } public void onCallIncoming(Call call, NameAddress callee, NameAddress caller, String sdp, Message invite) { lCalleeSemaphoreIncoming.release(); @@ -183,12 +197,13 @@ public class SipClient { Assert.assertTrue("caller call not accepted until ["+lTimout+"]", lCallerSemaphoreAccepted.tryAcquire(lTimout,TimeUnit.MILLISECONDS)); Assert.assertTrue("callee call not confirmed until ["+lTimout+"]", lCalleeSemaphoreConfirmed.tryAcquire(lTimout,TimeUnit.MILLISECONDS)); Assert.assertTrue("caller call not closed until ["+lTimout+"]", lCalleeSemaphoreClosed.tryAcquire(lTimout,TimeUnit.MILLISECONDS)); - mLog.info("Call ok"); + return lCaller; } catch (Exception e) { mLog.error("Call ko",e); Assert.fail(e.getMessage()); + return null; }