Merge pull request #92 from jitsi/networkutils-rfc2732
Networkutils rfc2732
This commit is contained in:
commit
2e4bf351fe
@ -399,6 +399,15 @@ public class NetworkUtils
|
|||||||
|
|
||||||
colonIndex = -1;
|
colonIndex = -1;
|
||||||
int i = 0, j = 0;
|
int i = 0, j = 0;
|
||||||
|
|
||||||
|
// Can be wrapped in []
|
||||||
|
if (addrBuff[i] == '[')
|
||||||
|
{
|
||||||
|
++i;
|
||||||
|
if (scopeID == -1)
|
||||||
|
--srcb_length;
|
||||||
|
}
|
||||||
|
|
||||||
// Starting : mean we need to have at least one more.
|
// Starting : mean we need to have at least one more.
|
||||||
if (addrBuff[i] == ':')
|
if (addrBuff[i] == ':')
|
||||||
if (addrBuff[++i] != ':')
|
if (addrBuff[++i] != ':')
|
||||||
|
|||||||
47
src/test/java/org/ice4j/ice/NetworkUtilsTest.java
Normal file
47
src/test/java/org/ice4j/ice/NetworkUtilsTest.java
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
/*
|
||||||
|
* ice4j, the OpenSource Java Solution for NAT and Firewall Traversal.
|
||||||
|
*
|
||||||
|
* Copyright @ 2015 Atlassian Pty Ltd
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.ice4j.ice;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
import org.junit.*;
|
||||||
|
|
||||||
|
public class NetworkUtilsTest
|
||||||
|
{
|
||||||
|
@Test
|
||||||
|
public void testIpv6StringToBytes()
|
||||||
|
{
|
||||||
|
byte[] addr = NetworkUtils.strToIPv6("::12");
|
||||||
|
assertNotNull(addr);
|
||||||
|
assertEquals(18, addr[15]);
|
||||||
|
|
||||||
|
addr = NetworkUtils.strToIPv6("[::12]");
|
||||||
|
assertNotNull(addr);
|
||||||
|
assertEquals(18, addr[15]);
|
||||||
|
|
||||||
|
addr = NetworkUtils.strToIPv6("::12%1");
|
||||||
|
assertNotNull(addr);
|
||||||
|
assertEquals(18, addr[15]);
|
||||||
|
|
||||||
|
addr = NetworkUtils.strToIPv6("[::12%1]");
|
||||||
|
assertNotNull(addr);
|
||||||
|
assertEquals(18, addr[15]);
|
||||||
|
|
||||||
|
assertNull(NetworkUtils.strToIPv6("[::12]%1"));
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user