package org.opendaylight.mdsal.model.ietf.util;
import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
import com.google.common.net.InetAddresses;
import java.net.Inet4Address;
import java.net.InetAddress;
+import javax.annotation.Nonnull;
/**
* IPv6 address parsing for ietf-inet-types ipv6-address and ipv6-prefix. This is an internal implementation
/**
* Convert Ipv6Address object to a valid Canonical v6 address in byte format
*
- * @param ipv6Address - v6 Address object
- *
- * FIXME: rovarga: this looks wrong
- * @return - byte array of size 16. Last byte contains netmask
+ * @param addrStr IPv6 address string
+ * @return byte array of size 16 containing the binary IPv6 address
+ * @throws NullPointerException if ipv6address is null
*/
- public static byte[] bytesForString(final String ipv6Address) {
- /*
- * Do not modify this routine to take direct strings input!!!
- * Key checks have been removed based on the assumption that
- * the input is validated via regexps in Ipv6Prefix()
- */
-
- String [] address = (ipv6Address).split("%");
-
- int colonp;
- char ch;
- boolean saw_xdigit;
-
- /* Isn't it fun - the above variable names are the same in BSD and Sun sources */
-
- int val;
-
- char[] src = address[0].toCharArray();
-
- byte[] dst = new byte[INADDR6SZ];
-
- int src_length = src.length;
-
- colonp = -1;
- int i = 0, j = 0;
+ public static @Nonnull byte[] bytesForString(final @Nonnull String addrStr) {
+ final int percentPos = addrStr.indexOf('%');
+ final int addrStrLen = percentPos == -1 ? addrStr.length() : percentPos;
/* Leading :: requires some special handling. */
-
- /* Isn't it fun - the above comment is again the same in BSD and Sun sources,
- * We will derive our code from BSD. Shakespear always sounds better
- * in original Clingon. So does Dilbert.
- */
-
- if (src[i] == ':') {
- Preconditions.checkArgument(src[++i] == ':', "Invalid v6 address");
+ int i = 0;
+ if (addrStr.charAt(i) == ':') {
+ // Note ++i side-effect in check
+ Preconditions.checkArgument(addrStr.charAt(++i) == ':', "Invalid v6 address '%s'", addrStr);
}
- int curtok = i;
- saw_xdigit = false;
-
-
- val = 0;
- while (i < src_length) {
- ch = src[i++];
- int chval = Character.digit(ch, 16);
-
- /* Business as usual - ipv6 address digit.
- * We can remove all checks from the original BSD code because
- * the regexp has already verified that we are not being fed
- * anything bigger than 0xffff between the separators.
- */
+ final byte[] dst = new byte[INADDR6SZ];
- if (chval != -1) {
- val <<= 4;
- val |= chval;
- saw_xdigit = true;
- continue;
- }
+ boolean saw_xdigit = false;
+ int val = 0;
+ int colonp = -1;
+ int j = 0;
+ int curtok = i;
+ while (i < addrStrLen) {
+ final char ch = addrStr.charAt(i++);
/* v6 separator */
-
if (ch == ':') {
curtok = i;
if (!saw_xdigit) {
}
/* frankenstein - v4 attached to v6, mixed notation */
-
if (ch == '.' && ((j + INADDR4SZ) <= INADDR6SZ)) {
/* this has passed the regexp so it is fairly safe to parse it
* straight away. As v4 addresses do not suffer from the same
- * defficiencies as the java v6 implementation we can invoke it
+ * deficiencies as the java v6 implementation we can invoke it
* straight away and be done with it
*/
-
- Preconditions.checkArgument(j != (INADDR6SZ - INADDR4SZ - 1), "Invalid v4 in v6 mapping");
-
- InetAddress _inet_form = InetAddresses.forString(address[0].substring(curtok, src_length));
+ Preconditions.checkArgument(j != (INADDR6SZ - INADDR4SZ - 1), "Invalid v4 in v6 mapping in %s", addrStr);
+ InetAddress _inet_form = InetAddresses.forString(addrStr.substring(curtok, addrStrLen));
Preconditions.checkArgument(_inet_form instanceof Inet4Address);
System.arraycopy(_inet_form.getAddress(), 0, dst, j, INADDR4SZ);
saw_xdigit = false;
break;
}
- /* removed parser exit on invalid char - no need to do it, regexp checks it */
+
+ /* Business as usual - ipv6 address digit.
+ * We can remove all checks from the original BSD code because
+ * the regexp has already verified that we are not being fed
+ * anything bigger than 0xffff between the separators.
+ */
+ final int chval = AbstractIetfYangUtil.hexValue(ch);
+ val = (val << 4) | chval;
+ saw_xdigit = true;
}
+
if (saw_xdigit) {
- Preconditions.checkArgument(j + INT16SZ <= INADDR6SZ, "Overrun in v6 parsing, should not occur");
+ Verify.verify(j + INT16SZ <= INADDR6SZ, "Overrun in parsing of '%s', should not occur", addrStr);
dst[j++] = (byte) ((val >> 8) & 0xff);
dst[j++] = (byte) (val & 0xff);
}
if (colonp != -1) {
- int n = j - colonp;
+ Verify.verify(j != INADDR6SZ, "Overrun in parsing of '%s', should not occur", addrStr);
- Preconditions.checkArgument(j != INADDR6SZ, "Overrun in v6 parsing, should not occur");
+ final int n = j - colonp;
for (i = 1; i <= n; i++) {
dst[INADDR6SZ - i] = dst[colonp + n - i];
dst[colonp + n - i] = 0;
j = INADDR6SZ;
}
- Preconditions.checkArgument(j == INADDR6SZ, "Overrun in v6 parsing, should not occur");
-
+ Verify.verify(j == INADDR6SZ, "Overrun in parsing of '%s', should not occur", addrStr);
return dst;
}
-
}
Code Review / mdsal.git / blobdiff