master moved from 0da0a56383b3 to ff3fbee669c9

5 new revisions:

Revision: d17bdb0e3069
Author:   vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Tue Nov  5 07:30:31 2013 UTC
Log: Remove inaccurate validation for initial testing (contributed by Yulia...
http://code.google.com/p/jain-sip/source/detail?r=d17bdb0e3069

Revision: cf32f8dc63f7
Author:   vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Wed Nov  6 14:19:47 2013 UTC
Log:      Test for JSIP-459...
http://code.google.com/p/jain-sip/source/detail?r=cf32f8dc63f7

Revision: 04c8ef1ece03
Author:   vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Wed Nov  6 14:20:56 2013 UTC
Log:      Fix for JSIP-459 IPv6 callids...
http://code.google.com/p/jain-sip/source/detail?r=04c8ef1ece03

Revision: 549d7549a7e3
Author:   jbemmel <jbemmel@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Mon Nov 18 04:49:00 2013 UTC
Log:      Fix compilation issue with missing Runnable interface...
http://code.google.com/p/jain-sip/source/detail?r=549d7549a7e3

Revision: ff3fbee669c9
Author:   vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Sun Dec 29 04:24:08 2013 UTC
Log: trustStorePassword for blocking IO http://java.net/jira/browse/JSIP-45...
http://code.google.com/p/jain-sip/source/detail?r=ff3fbee669c9

==============================================================================
Revision: d17bdb0e3069
Author:   vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Tue Nov  5 07:30:31 2013 UTC
Log: Remove inaccurate validation for initial testing (contributed by Yulian Oifa)

git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2298 8e71dc83-d81e-6649-80f2-80b843a9b2be

http://code.google.com/p/jain-sip/source/detail?r=d17bdb0e3069

Modified:
 /src/gov/nist/javax/sip/address/SipUri.java
 /src/gov/nist/javax/sip/stack/HopImpl.java

=======================================
--- /src/gov/nist/javax/sip/address/SipUri.java Tue Dec 11 14:08:29 2012 UTC
+++ /src/gov/nist/javax/sip/address/SipUri.java Tue Nov  5 07:30:31 2013 UTC
@@ -996,16 +996,16 @@
     public void setTransportParam(String transport) throws ParseException {
         if (transport == null)
             throw new NullPointerException("null arg");
-        if (transport.compareToIgnoreCase("UDP") == 0
+        /*if (transport.compareToIgnoreCase("UDP") == 0
             || transport.compareToIgnoreCase("TLS") == 0
             || transport.compareToIgnoreCase("TCP") == 0
             || transport.compareToIgnoreCase("SCTP") == 0
             || transport.compareToIgnoreCase(ListeningPointExt.WS) == 0
-            || transport.compareToIgnoreCase(ListeningPointExt.WSS) == 0) {
+ || transport.compareToIgnoreCase(ListeningPointExt.WSS) == 0) {*/ NameValue nv = new NameValue(TRANSPORT, transport.toLowerCase());
             uriParms.set(nv);
-        } else
-            throw new ParseException("bad transport " + transport, 0);
+        /*} else
+            throw new ParseException("bad transport " + transport, 0);*/
     }

     /** Returns the user part of this SipURI, or null if it is not set.
=======================================
--- /src/gov/nist/javax/sip/stack/HopImpl.java  Fri Jul 17 18:59:52 2009 UTC
+++ /src/gov/nist/javax/sip/stack/HopImpl.java  Tue Nov  5 07:30:31 2013 UTC
@@ -139,12 +139,12 @@
             throw new IllegalArgumentException("Bad IPv6 reference spec");
         }

-        if (transport.compareToIgnoreCase("UDP") != 0
+        /*if (transport.compareToIgnoreCase("UDP") != 0
             && transport.compareToIgnoreCase("TLS") != 0
             && transport.compareToIgnoreCase("TCP") != 0) {
             System.err.println("Bad transport string " + transport);
             throw new IllegalArgumentException(hop);
-        }
+        }*/
     }

     /**

==============================================================================
Revision: cf32f8dc63f7
Author:   vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Wed Nov  6 14:19:47 2013 UTC
Log:      Test for JSIP-459

git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2299 8e71dc83-d81e-6649-80f2-80b843a9b2be

http://code.google.com/p/jain-sip/source/detail?r=cf32f8dc63f7

Modified:
 /src/test/unit/gov/nist/javax/sip/parser/InReplyToParserTest.java

=======================================
--- /src/test/unit/gov/nist/javax/sip/parser/InReplyToParserTest.java Fri Jul 17 18:59:52 2009 UTC +++ /src/test/unit/gov/nist/javax/sip/parser/InReplyToParserTest.java Wed Nov 6 14:19:47 2013 UTC
@@ -36,7 +36,7 @@
      */
     public void testParser() {

-        String p[] = {
+ String p[] = { "In-Reply-To: 2d809fa3f4ad434c760f23bc130d062b@::6555:2418:5736:aee4:a00:8, henxdhwhw445wdgh107020000@::2425:2418:5736:aee7:a00:8\n", "In-Reply-To: [email protected], [email protected]\n",
                 "In-Reply-To: 70710 \n"
                 };

==============================================================================
Revision: 04c8ef1ece03
Author:   vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Wed Nov  6 14:20:56 2013 UTC
Log:      Fix for JSIP-459 IPv6 callids

git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2300 8e71dc83-d81e-6649-80f2-80b843a9b2be

http://code.google.com/p/jain-sip/source/detail?r=04c8ef1ece03

Modified:
 /src/gov/nist/javax/sip/parser/InReplyToParser.java
 /src/gov/nist/javax/sip/parser/TokenTypes.java

=======================================
--- /src/gov/nist/javax/sip/parser/InReplyToParser.java Fri Jul 17 18:59:52 2009 UTC +++ /src/gov/nist/javax/sip/parser/InReplyToParser.java Wed Nov 6 14:20:56 2013 UTC
@@ -79,7 +79,7 @@
                 Token token = lexer.getNextToken();
                 if (lexer.lookAhead(0) == '@') {
                     this.lexer.match('@');
-                    this.lexer.match(TokenTypes.ID);
+                    this.lexer.match(TokenTypes.SAFE);
                     Token secToken = lexer.getNextToken();
                     inReplyTo.setCallId(
token.getTokenValue() + "@" + secToken.getTokenValue());
@@ -101,7 +101,7 @@
                     token = lexer.getNextToken();
                     if (lexer.lookAhead(0) == '@') {
                         this.lexer.match('@');
-                        this.lexer.match(TokenTypes.ID);
+                        this.lexer.match(TokenTypes.SAFE);
                         Token secToken = lexer.getNextToken();
                         inReplyTo.setCallId(
                             token.getTokenValue()
=======================================
--- /src/gov/nist/javax/sip/parser/TokenTypes.java Tue Jan 12 00:05:27 2010 UTC +++ /src/gov/nist/javax/sip/parser/TokenTypes.java Wed Nov 6 14:20:56 2013 UTC
@@ -170,6 +170,7 @@
     public static final int ALPHA = LexerCore.ALPHA;
     public static final int DIGIT = LexerCore.DIGIT;
     public static final int ID = LexerCore.ID;
+    public static final int SAFE = LexerCore.SAFE;
     public static final int WHITESPACE = LexerCore.WHITESPACE;
     public static final int BACKSLASH = LexerCore.BACKSLASH;
     public static final int QUOTE = LexerCore.QUOTE;

==============================================================================
Revision: 549d7549a7e3
Author:   jbemmel <jbemmel@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Mon Nov 18 04:49:00 2013 UTC
Log:      Fix compilation issue with missing Runnable interface

git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2301 8e71dc83-d81e-6649-80f2-80b843a9b2be

http://code.google.com/p/jain-sip/source/detail?r=549d7549a7e3

Modified:
 /src/gov/nist/javax/sip/stack/sctp/SCTPMessageProcessor.java

=======================================
--- /src/gov/nist/javax/sip/stack/sctp/SCTPMessageProcessor.java Thu Nov 5 10:10:28 2009 UTC +++ /src/gov/nist/javax/sip/stack/sctp/SCTPMessageProcessor.java Mon Nov 18 04:49:00 2013 UTC
@@ -23,7 +23,7 @@
  *
  * @author Jeroen van Bemmel
  */
-public final class SCTPMessageProcessor extends MessageProcessor {
+public final class SCTPMessageProcessor extends MessageProcessor implements Runnable {

        private SctpServerChannel sctpServerChannel;
        private Selector selector;

==============================================================================
Revision: ff3fbee669c9
Author:   vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Sun Dec 29 04:24:08 2013 UTC
Log: trustStorePassword for blocking IO http://java.net/jira/browse/JSIP-450

git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2302 8e71dc83-d81e-6649-80f2-80b843a9b2be

http://code.google.com/p/jain-sip/source/detail?r=ff3fbee669c9

Modified:
 /src/gov/nist/core/net/SslNetworkLayer.java
 /src/gov/nist/javax/sip/SipStackImpl.java

=======================================
--- /src/gov/nist/core/net/SslNetworkLayer.java Thu Dec  6 22:39:55 2012 UTC
+++ /src/gov/nist/core/net/SslNetworkLayer.java Sun Dec 29 04:24:08 2013 UTC
@@ -99,6 +99,7 @@
             String trustStoreFile,
             String keyStoreFile,
             char[] keyStorePassword,
+            char[] trustStorePassword,
String keyStoreType) throws GeneralSecurityException, FileNotFoundException, IOException
     {
         SSLContext sslContext;
@@ -113,7 +114,7 @@
         KeyStore trustStore = KeyStore.getInstance(
keyStoreType != null ? keyStoreType : KeyStore.getDefaultType());
         keyStore.load(new FileInputStream(keyStoreFile), keyStorePassword);
- trustStore.load(new FileInputStream(trustStoreFile), keyStorePassword); + trustStore.load(new FileInputStream(trustStoreFile), trustStorePassword);
         tmFactory.init(trustStore);
         kmFactory.init(keyStore, keyStorePassword);
         if(sipStack.getClientAuth() == ClientAuthType.DisabledAll) {
=======================================
--- /src/gov/nist/javax/sip/SipStackImpl.java   Thu Apr 18 15:09:05 2013 UTC
+++ /src/gov/nist/javax/sip/SipStackImpl.java   Sun Dec 29 04:24:08 2013 UTC
@@ -552,7 +552,9 @@
  * to access the keyStore using the following property: <br>
  * <code>
* properties.setProperty("javax.net.ssl.keyStorePassword", "&lt;password&gt;"); + * properties.setProperty("javax.net.ssl.trustStorePassword", "&lt;password&gt;");
  * </code> <br>
+ * If not trustStorePassword is provided then the keyStorePassword will be used for both.
  * The trust store can be changed, to a separate file with the following
  * setting: <br>
  * <code>
@@ -866,11 +868,15 @@
                        }
                        String keyStorePassword = configurationProperties
                                        
.getProperty("javax.net.ssl.keyStorePassword");
+                       String trustStorePassword = configurationProperties
+                                       
.getProperty("javax.net.ssl.trustStorePassword", keyStorePassword);
                        try {
                                this.networkLayer = new SslNetworkLayer(this, 
trustStoreFile,
                                                keyStoreFile,
                                                keyStorePassword != null ?
                                                    
keyStorePassword.toCharArray() : null,
+                                               trustStorePassword != null ?
+                                                                   
trustStorePassword.toCharArray() : null,
                                                configurationProperties
                                                                
.getProperty("javax.net.ssl.keyStoreType"));
                        } catch (Exception e1) {

--

--- 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.

Reply via email to