master moved from 13a2e2ddb1f7 to 65190ac7f46c
2 new revisions:
Revision: a12747a5021a
Author: vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Fri Jul 12 01:53:02 2013 UTC
Log: https://java.net/jira/browse/JSIP-432 Exhaust the buffers until
empty ...
http://code.google.com/p/jain-sip/source/detail?r=a12747a5021a
Revision: 65190ac7f46c
Author: vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Thu Aug 22 20:26:01 2013 UTC
Log: https://java.net/jira/browse/JSIP-432...
http://code.google.com/p/jain-sip/source/detail?r=65190ac7f46c
==============================================================================
Revision: a12747a5021a
Author: vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Fri Jul 12 01:53:02 2013 UTC
Log: https://java.net/jira/browse/JSIP-432 Exhaust the buffers until
empty to avoid lagging on slow traffic
git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2291
8e71dc83-d81e-6649-80f2-80b843a9b2be
http://code.google.com/p/jain-sip/source/detail?r=a12747a5021a
Modified:
/src/gov/nist/javax/sip/stack/NioWebSocketMessageChannel.java
=======================================
--- /src/gov/nist/javax/sip/stack/NioWebSocketMessageChannel.java Tue Jun
4 05:23:07 2013 UTC
+++ /src/gov/nist/javax/sip/stack/NioWebSocketMessageChannel.java Fri Jul
12 01:53:02 2013 UTC
@@ -144,9 +144,15 @@
}
} else if(!readingHttp) {
ByteArrayInputStream bios = new
ByteArrayInputStream(bytes);
- byte[] decodedMsg = codec.decode(bios);
- if(decodedMsg == null) return; // not enough data
- nioParser.addBytes(decodedMsg);
+ byte[] decodedMsg = null;
+ do {
+ decodedMsg = codec.decode(bios);
+ if(decodedMsg == null) {
+ return; // the codec can't parse a full websocket frame, we will try
again when have more data
+ }
+ nioParser.addBytes(decodedMsg);
+ } while (decodedMsg != null);
+
}
}
==============================================================================
Revision: 65190ac7f46c
Author: vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Thu Aug 22 20:26:01 2013 UTC
Log: https://java.net/jira/browse/JSIP-432
Add websocket example app - b2bua server.
git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2292
8e71dc83-d81e-6649-80f2-80b843a9b2be
http://code.google.com/p/jain-sip/source/detail?r=65190ac7f46c
Added:
/src/examples/websocket/B2BUA.java
/src/examples/websocket/README.txt
/src/examples/websocket/build.xml
=======================================
--- /dev/null
+++ /src/examples/websocket/B2BUA.java Thu Aug 22 20:26:01 2013 UTC
@@ -0,0 +1,432 @@
+package examples.websocket;
+
+import javax.sip.*;
+import javax.sip.address.*;
+import javax.sip.header.*;
+import javax.sip.message.*;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+
+import examples.simplecallsetup.Shootist;
+import gov.nist.javax.sip.stack.NioMessageProcessorFactory;
+
+import java.text.ParseException;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * This class is a B2BUA using Websocket transport. You can use any two
Websocket SIP phones
+ * to register into the server and call each other by the username the
advertised in the REGISTER
+ * request. The registrar is just storing the contacts of the users in a
HashMap locally.
+ *
+ * Requiring registration is the only significant difference from the
usual JAIN-SIP call flow. The
+ * registrations are required because a phone must be able to receive
calls on the websocket while
+ * being idle otherwise.
+ *
+ * @author Vladimir Ralev
+ */
+public class B2BUA implements SipListener {
+
+ private static AddressFactory addressFactory;
+
+ private static MessageFactory messageFactory;
+
+ private static HeaderFactory headerFactory;
+
+ private static SipStack sipStack;
+
+ private static final String myAddress = "127.0.0.1";
+
+ private static final int myPort = 5082;
+
+ private AtomicLong counter = new AtomicLong();
+
+ private ListeningPoint listeningPoint;
+
+ private SipProvider sipProvider;
+
+ private String transport = "ws";
+
+ private HashMap<String, SipURI> registrar = new HashMap<String,
SipURI>();
+
+ public void processRequest(RequestEvent requestEvent) {
+ Request request = requestEvent.getRequest();
+ ServerTransaction serverTransactionId = requestEvent
+ .getServerTransaction();
+
+ System.out.println("\n\nRequest " + request.getMethod()
+ + " received at " + sipStack.getStackName()
+ + " with server transaction id " +
serverTransactionId);
+
+ if (request.getMethod().equals(Request.INVITE)) {
+ processInvite(requestEvent, serverTransactionId);
+ } else if (request.getMethod().equals(Request.ACK)) {
+ processAck(requestEvent, serverTransactionId);
+ } else if (request.getMethod().equals(Request.CANCEL)) {
+ processCancel(requestEvent, serverTransactionId);
+ } else if (request.getMethod().equals(Request.REGISTER)) {
+ processRegister(requestEvent, serverTransactionId);
+ } else {
+ processInDialogRequest(requestEvent,
serverTransactionId);
+ }
+ }
+
+ public void processResponse(ResponseEvent responseEvent) {
+ ClientTransaction ct = responseEvent.getClientTransaction();
+ Response response = responseEvent.getResponse();
+ ServerTransaction st = (ServerTransaction)
ct.getApplicationData();
+ try {
+ Response otherResponse =
messageFactory.createResponse(response.getStatusCode(), st.getRequest());
+ if(response.getStatusCode() == 200 &&
ct.getRequest().getMethod().equals("INVITE")) {
+ Address address = addressFactory.createAddress("B2BUA
<sip:"
+ + myAddress + ":" + myPort +
">");
+ ContactHeader contactHeader = headerFactory
+ .createContactHeader(address);
+ response.addHeader(contactHeader);
+ ToHeader toHeader = (ToHeader)
otherResponse.getHeader(ToHeader.NAME);
+ if(toHeader.getTag() == null) toHeader.setTag(new
Long(counter.getAndIncrement()).toString());
+ otherResponse.addHeader(contactHeader);
+ }
+ st.sendResponse(otherResponse);
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Process the ACK request, forward it to the other leg.
+ */
+ public void processAck(RequestEvent requestEvent,
+ ServerTransaction serverTransaction) {
+ try {
+ Dialog dialog = serverTransaction.getDialog();
+ System.out.println("b2bua: got an ACK! ");
+ System.out.println("Dialog State = " +
dialog.getState());
+ Dialog otherDialog = (Dialog)
dialog.getApplicationData();
+ Request request =
otherDialog.createAck(otherDialog.getLocalSeqNumber());
+ otherDialog.sendAck(request);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ }
+
+ /**
+ * Process the invite request.
+ */
+ public void processInvite(RequestEvent requestEvent,
+ ServerTransaction serverTransaction) {
+ SipProvider sipProvider = (SipProvider)
requestEvent.getSource();
+ Request request = requestEvent.getRequest();
+ try {
+ System.out.println("b2bua: got an Invite sending
Trying");
+ ServerTransaction st =
requestEvent.getServerTransaction();
+ if(st == null) {
+ st =
sipProvider.getNewServerTransaction(request);
+ }
+ Dialog dialog = st.getDialog();
+
+ ToHeader to = (ToHeader)
request.getHeader(ToHeader.NAME);
+ SipURI toUri = (SipURI) to.getAddress().getURI();
+
+ SipURI target = registrar.get(toUri.getUser());
+
+ if(target == null) {
+ System.out.println("User " + toUri + " is not
registered.");
+ throw new RuntimeException("User not registered
" + toUri);
+ } else {
+ ClientTransaction otherLeg = call(target);
+ otherLeg.setApplicationData(st);
+ st.setApplicationData(otherLeg);
+ dialog.setApplicationData(otherLeg.getDialog());
+ otherLeg.getDialog().setApplicationData(dialog);
+ }
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ System.exit(0);
+ }
+ }
+
+ /**
+ * Process the any in dialog request - MESSAGE, BYE, INFO, UPDATE.
+ */
+ public void processInDialogRequest(RequestEvent requestEvent,
+ ServerTransaction serverTransactionId) {
+ SipProvider sipProvider = (SipProvider)
requestEvent.getSource();
+ Request request = requestEvent.getRequest();
+ Dialog dialog = requestEvent.getDialog();
+ System.out.println("local party = " + dialog.getLocalParty());
+ try {
+ System.out.println("b2bua: got a bye sending OK.");
+ Response response = messageFactory.createResponse(200,
request);
+ serverTransactionId.sendResponse(response);
+ System.out.println("Dialog State is "
+ +
serverTransactionId.getDialog().getState());
+
+ Dialog otherLeg = (Dialog) dialog.getApplicationData();
+ Request otherBye =
otherLeg.createRequest(request.getMethod());
+ ClientTransaction clientTransaction =
sipProvider.getNewClientTransaction(otherBye);
+
clientTransaction.setApplicationData(serverTransactionId);
+
serverTransactionId.setApplicationData(clientTransaction);
+ otherLeg.sendRequest(clientTransaction);
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ System.exit(0);
+
+ }
+ }
+ public void processRegister(RequestEvent requestEvent,
+ ServerTransaction serverTransactionId) {
+ Request request = requestEvent.getRequest();
+ ContactHeader contact = (ContactHeader)
request.getHeader(ContactHeader.NAME);
+ SipURI contactUri = (SipURI) contact.getAddress().getURI();
+ FromHeader from = (FromHeader)
request.getHeader(FromHeader.NAME);
+ SipURI fromUri = (SipURI) from.getAddress().getURI();
+ registrar.put(fromUri.getUser(), contactUri);
+ try {
+ Response response =
this.messageFactory.createResponse(200, request);
+ ServerTransaction serverTransaction =
sipProvider.getNewServerTransaction(request);
+ serverTransaction.sendResponse(response);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void processCancel(RequestEvent requestEvent,
+ ServerTransaction serverTransactionId) {}
+
+ public void processTimeout(javax.sip.TimeoutEvent timeoutEvent) {
+ Transaction transaction;
+ if (timeoutEvent.isServerTransaction()) {
+ transaction = timeoutEvent.getServerTransaction();
+ } else {
+ transaction = timeoutEvent.getClientTransaction();
+ }
+ System.out.println("state = " + transaction.getState());
+ System.out.println("dialog = " + transaction.getDialog());
+ System.out.println("dialogState = "
+ + transaction.getDialog().getState());
+ System.out.println("Transaction Time out");
+ }
+
+ public void init() {
+
+ ConsoleAppender console = new ConsoleAppender(); //create
appender
+ //configure the appender
+ String PATTERN = "%d [%p|%c|%C{1}] %m%n";
+ console.setLayout(new PatternLayout(PATTERN));
+ console.setThreshold(Level.DEBUG);
+ console.activateOptions();
+ //add appender to any Logger (here is root)
+ Logger.getRootLogger().addAppender(console);
+ SipFactory sipFactory = null;
+ sipStack = null;
+ sipFactory = SipFactory.getInstance();
+ sipFactory.setPathName("gov.nist");
+ Properties properties = new Properties();
+ properties.setProperty("javax.sip.STACK_NAME", "shootme");
+ // You need 16 for logging traces. 32 for debug + traces.
+ // Your code will limp at 32 but it is best for debugging.
+ properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL",
"LOG4J");
+ properties.setProperty("gov.nist.javax.sip.DEBUG_LOG",
+ "shootmedebug.txt");
+ properties.setProperty("gov.nist.javax.sip.SERVER_LOG",
+ "shootmelog.txt");
+ properties.setProperty("gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY",
NioMessageProcessorFactory.class.getName());
+
+ try {
+ // Create SipStack object
+ sipStack = sipFactory.createSipStack(properties);
+ System.out.println("sipStack = " + sipStack);
+ } catch (PeerUnavailableException e) {
+ // could not find
+ // gov.nist.jain.protocol.ip.sip.SipStackImpl
+ // in the classpath
+ e.printStackTrace();
+ System.err.println(e.getMessage());
+ if (e.getCause() != null)
+ e.getCause().printStackTrace();
+ System.exit(0);
+ }
+
+ try {
+ headerFactory = sipFactory.createHeaderFactory();
+ addressFactory = sipFactory.createAddressFactory();
+ messageFactory = sipFactory.createMessageFactory();
+ this.listeningPoint =
sipStack.createListeningPoint("127.0.0.1",
+ myPort, transport);
+
+ B2BUA listener = this;
+
+ sipProvider =
sipStack.createSipProvider(listeningPoint);
+ System.out.println("ws provider " + sipProvider);
+ sipProvider.addSipListener(listener);
+
+ } catch (Exception ex) {
+ System.out.println(ex.getMessage());
+ ex.printStackTrace();
+ }
+ }
+
+ public static void main(String args[]) {
+ new B2BUA().init();
+ }
+
+ public void processIOException(IOExceptionEvent exceptionEvent) {
+ System.out.println("IOException");
+
+ }
+
+ public void processTransactionTerminated(
+ TransactionTerminatedEvent transactionTerminatedEvent) {
+ if (transactionTerminatedEvent.isServerTransaction())
+ System.out.println("Transaction terminated event
recieved"
+ +
transactionTerminatedEvent.getServerTransaction());
+ else
+ System.out.println("Transaction terminated "
+ +
transactionTerminatedEvent.getClientTransaction());
+
+ }
+
+ public void processDialogTerminated(
+ DialogTerminatedEvent dialogTerminatedEvent) {
+ System.out.println("Dialog terminated event recieved");
+ Dialog d = dialogTerminatedEvent.getDialog();
+ System.out.println("Local Party = " + d.getLocalParty());
+
+ }
+
+ public ClientTransaction call(SipURI destination) {
+ try {
+
+ String fromName = "B2BUA";
+ String fromSipAddress = "here.com";
+ String fromDisplayName = "B2BUA";
+
+ String toSipAddress = "there.com";
+ String toUser = "Target";
+ String toDisplayName = "Target";
+
+ // create >From Header
+ SipURI fromAddress =
addressFactory.createSipURI(fromName,
+ fromSipAddress);
+
+ Address fromNameAddress =
addressFactory.createAddress(fromAddress);
+ fromNameAddress.setDisplayName(fromDisplayName);
+ FromHeader fromHeader = headerFactory.createFromHeader(
+ fromNameAddress, new
Long(counter.getAndIncrement()).toString());
+
+ // create To Header
+ SipURI toAddress = addressFactory
+ .createSipURI(toUser, toSipAddress);
+ Address toNameAddress =
addressFactory.createAddress(toAddress);
+ toNameAddress.setDisplayName(toDisplayName);
+ ToHeader toHeader =
headerFactory.createToHeader(toNameAddress,
+ null);
+
+ // create Request URI
+ SipURI requestURI = destination;
+
+ // Create ViaHeaders
+
+ ArrayList viaHeaders = new ArrayList();
+ String ipAddress = listeningPoint.getIPAddress();
+ ViaHeader viaHeader =
headerFactory.createViaHeader(ipAddress,
+
sipProvider.getListeningPoint(transport).getPort(),
+ transport, null);
+
+ // add via headers
+ viaHeaders.add(viaHeader);
+
+ // Create ContentTypeHeader
+ ContentTypeHeader contentTypeHeader = headerFactory
+ .createContentTypeHeader("application",
"sdp");
+
+ // Create a new CallId header
+ CallIdHeader callIdHeader = sipProvider.getNewCallId();
+
+ // Create a new Cseq header
+ CSeqHeader cSeqHeader =
headerFactory.createCSeqHeader(1L,
+ Request.INVITE);
+
+ // Create a new MaxForwardsHeader
+ MaxForwardsHeader maxForwards = headerFactory
+ .createMaxForwardsHeader(70);
+
+ // Create the request.
+ Request request =
messageFactory.createRequest(requestURI,
+ Request.INVITE, callIdHeader,
cSeqHeader, fromHeader,
+ toHeader, viaHeaders, maxForwards);
+ // Create contact headers
+ String host = "127.0.0.1";
+
+ SipURI contactUrl =
addressFactory.createSipURI(fromName, host);
+ contactUrl.setPort(listeningPoint.getPort());
+ contactUrl.setLrParam();
+
+ // Create the contact name address.
+ SipURI contactURI =
addressFactory.createSipURI(fromName, host);
+
contactURI.setPort(sipProvider.getListeningPoint(transport)
+ .getPort());
+
+ Address contactAddress =
addressFactory.createAddress(contactURI);
+
+ // Add the contact address.
+ contactAddress.setDisplayName(fromName);
+
+ ContactHeader contactHeader =
headerFactory.createContactHeader(contactAddress);
+ request.addHeader(contactHeader);
+
+ // You can add extension headers of your own making
+ // to the outgoing SIP request.
+ // Add the extension header.
+ Header extensionHeader =
headerFactory.createHeader("My-Header",
+ "my header value");
+ request.addHeader(extensionHeader);
+
+ String sdpData = "v=0\r\n"
+ + "o=4855 13760799956958020
13760799956958020"
+ + " IN IP4 129.6.55.78\r\n" + "s=mysession
session\r\n"
+ + "p=+46 8 52018010\r\n" + "c=IN IP4
129.6.55.78\r\n"
+ + "t=0 0\r\n" + "m=audio 6022 RTP/AVP 0 4
18\r\n"
+ + "a=rtpmap:0 PCMU/8000\r\n" + "a=rtpmap:4
G723/8000\r\n"
+ + "a=rtpmap:18 G729A/8000\r\n" +
"a=ptime:20\r\n";
+ byte[] contents = sdpData.getBytes();
+
+ request.setContent(contents, contentTypeHeader);
+ // You can add as many extension headers as you
+ // want.
+
+ extensionHeader =
headerFactory.createHeader("My-Other-Header",
+ "my new header value ");
+ request.addHeader(extensionHeader);
+
+ Header callInfoHeader =
headerFactory.createHeader("Call-Info",
+ "<http://www.antd.nist.gov>");
+ request.addHeader(callInfoHeader);
+
+ // Create the client transaction.
+ ClientTransaction inviteTid =
sipProvider.getNewClientTransaction(request);
+
+ System.out.println("inviteTid = " + inviteTid);
+
+ // send the request out.
+
+ inviteTid.sendRequest();
+
+ return inviteTid;
+
+ } catch (Exception ex) {
+ System.out.println(ex.getMessage());
+ ex.printStackTrace();
+ }
+ return null;
+ }
+
+}
=======================================
--- /dev/null
+++ /src/examples/websocket/README.txt Thu Aug 22 20:26:01 2013 UTC
@@ -0,0 +1,13 @@
+This is a Websocket B2BUA server
+
+To run this example, open up two windows.
+
+From the first one, type
+
+ "ant b2bua"
+
+Now the server is ready and running. You can register two websocket phones
into it
+and make a call between them.
+
+For illustrative purposes, this example turns debugging and logging on. You
+should do so when you are developing your applications.
=======================================
--- /dev/null
+++ /src/examples/websocket/build.xml Thu Aug 22 20:26:01 2013 UTC
@@ -0,0 +1,28 @@
+<project basedir="." default="b2bua">
+ <property name="root" value="../../../" />
+ <property file="${root}/ant-build-config.properties" />
+ <property name="classes" value="${root}/classes" />
+ <property name="srcroot" value="${root}/src" />
+ <property name="log4j_jar" value="${root}/${log4j}" />
+ <property name="junit_jar" value="${root}/${junit}" />
+ <path id="project.class.path">
+ <pathelement location="${classes}" />
+ <pathelement location="${log4j_jar}" />
+ <pathelement location="${junit_jar}" />
+ </path>
+ <target name="make">
+ <javac debug="true" source="${javac.source}"
deprecation="${javac.deprecation}" debuglevel="${javac.debuglevel}"
srcdir="${srcroot}" includes="examples/simplecallsetup/**/*.java"
classpathref="project.class.path" destdir="${classes}">
+ </javac>
+ </target>
+ <target name="b2bua" depends="make" description="build and run the
example UAS.">
+ <delete file="shootmedebug.txt" />
+ <delete file="shootmelog.txt" />
+ <java classname="examples.websocket.B2BUA"
classpathref="project.class.path" fork="true">
+ </java>
+ </target>
+ <target name="clean" description="clean the logs">
+ <delete fileset="*debug.txt" />
+ <delete fileset="*log.txt" />
+ </target>
+
+</project>
--
---
You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
