From 1aa62564650aabf4147de9a5aca415738778cf56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=9C=B0=E5=B9=B3=E7=BA=BF?= <22250530@qq.com>
Date: Mon, 7 Sep 2015 11:06:13 +0800
Subject: [PATCH]

---
 .../icep/attr/XorMappedAddressAttribute.java  | 52 ++++++++++++++++---
 .../redkale/net/icep/stun/StunHeader.java     |  3 +-
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/src/com/wentch/redkale/net/icep/attr/XorMappedAddressAttribute.java b/src/com/wentch/redkale/net/icep/attr/XorMappedAddressAttribute.java
index 9375ef642..6613ce118 100644
--- a/src/com/wentch/redkale/net/icep/attr/XorMappedAddressAttribute.java
+++ b/src/com/wentch/redkale/net/icep/attr/XorMappedAddressAttribute.java
@@ -26,18 +26,51 @@ public class XorMappedAddressAttribute extends StunAttribute {
         this.address = address;
     }
 
+    /**
+     0000   b8 2a 72 c8 7c 7e 08 57 00 60 3b f6 08 00 45 00  .*r.|~.W.`;...E.
+     0010   00 78 00 00 40 00 30 11 6f 1a d8 5d f6 12 0a 1c  .x..@.0.o..]....
+     0020   02 cf 0d 96 e2 ba 00 64 f0 b3 
+     01 01 00 48     21 12 a4 42 50 38 69 55 2b 65 78 66 4e 68 76 32      00 01  .BP8iU+exfNhv2..
+     0040   00 08 00 01 e2 ba 71 5c fb ed 00 04 00 08 00 01  ......q\........
+     0050   0d 96 d8 5d f6 12 00 05 00 08 00 01 0d 97 d8 5d  ...]...........]
+     0060   f6 0f 80 20 00 08 00 01 c3 a8 50 4e 5f af 80 22  ... ......PN_.."
+     0070   00 14 56 6f 76 69 64 61 2e 6f 72 67 20 30 2e 39  ..Vovida.org 0.9
+     0080   37 2d 43 50 43 00                                7-CPC.
+     @param args
+     @throws Exception 
+     */
+    public static void main(String[] args) throws Exception {
+        final byte[] transactionid = format("21 12 a4 42 50 38 69 55 2b 65 78 66 4e 68 76 32");
+        byte[] attrs = format("80 20 00 08 00 01 c3 a8 50 4e 5f af");
+        XorMappedAddressAttribute attr = new XorMappedAddressAttribute().decode(ByteBuffer.wrap(attrs), transactionid);
+        System.out.println(attr);
+        ByteBuffer buffer = ByteBuffer.allocate(1024);
+        attr.encode(buffer, transactionid);
+        buffer.flip();
+        Utility.println(null, buffer);
+    }
+
+    private static byte[] format(String string) {
+        String[] strs = string.split("\\s+");
+        byte[] bs = new byte[strs.length];
+        for (int i = 0; i < bs.length; i++) {
+            bs[i] = (byte) Integer.parseInt(strs[i], 16);
+        }
+        return bs;
+    }
+
     @Override
-    public StunAttribute decode(final ByteBuffer buffer, final byte[] transactionid) {
-        final short attrid = buffer.getShort();
+    public XorMappedAddressAttribute decode(final ByteBuffer buffer, final byte[] transactionid) {
+        final short attrid = (short) (buffer.getShort() & 0x00ff);
         if (attrid != getAttributeid()) throw new IcepException(this.getClass().getSimpleName() + " has illegal attributeid " + attrid);
         final int bodysize = buffer.getShort() & 0xffff;
         final short family = buffer.getShort();
-        if (bodysize == 24 && family != 0x0002) throw new IcepException("bodysize = " + bodysize + " but family = " + family);
-        if (bodysize == 12 && family != 0x0001) throw new IcepException("bodysize = " + bodysize + " but family = " + family);
+        if (family == 0x0001 && bodysize != 8) throw new IcepException("family = " + family + " but bodysize = " + bodysize);
+        if (family == 0x0002 && bodysize != 20) throw new IcepException("family = " + family + " but bodysize = " + bodysize);
         final int port = (buffer.getShort() ^ ((transactionid[0] << 8 & 0x0000FF00) | (transactionid[1] & 0x000000FF))) & 0xffff;
         byte[] bytes = new byte[family == 0x0002 ? 16 : 4];
         buffer.get(bytes);
-        for (int i = 0; i <= bytes.length; i++) {
+        for (int i = 0; i < bytes.length; i++) {
             bytes[i] ^= transactionid[i];
         }
         try {
@@ -52,11 +85,11 @@ public class XorMappedAddressAttribute extends StunAttribute {
     public ByteBuffer encode(final ByteBuffer buffer, final byte[] transactionid) {
         final boolean ipv6 = this.address.getAddress() instanceof Inet6Address;
         buffer.putShort((short) getAttributeid());
-        buffer.putShort((short) (ipv6 ? 24 : 12));
+        buffer.putShort((short) (ipv6 ? 20 : 8));
         buffer.putShort((short) (ipv6 ? 0x0002 : 0x0001));
         buffer.putShort((short) (this.address.getPort() ^ ((transactionid[0] << 8 & 0x0000FF00) | (transactionid[1] & 0x000000FF))));
         final byte[] bytes = this.address.getAddress().getAddress();
-        for (int i = 0; i <= bytes.length; i++) {
+        for (int i = 0; i < bytes.length; i++) {
             bytes[i] ^= transactionid[i];
         }
         buffer.put(bytes);
@@ -77,4 +110,9 @@ public class XorMappedAddressAttribute extends StunAttribute {
         return address;
     }
 
+    @Override
+    public String toString() {
+        return getName() + ":" + address;
+    }
+
 }
diff --git a/src/com/wentch/redkale/net/icep/stun/StunHeader.java b/src/com/wentch/redkale/net/icep/stun/StunHeader.java
index 88e609826..419fc8977 100644
--- a/src/com/wentch/redkale/net/icep/stun/StunHeader.java
+++ b/src/com/wentch/redkale/net/icep/stun/StunHeader.java
@@ -83,7 +83,8 @@ public class StunHeader {
     }
 
     public ByteBuffer encode(final ByteBuffer buffer) {
-        buffer.putShort((short) (this.typeid << 8 | this.actionid)); //requestid
+        buffer.put((byte) this.typeid);
+        buffer.put((byte) this.actionid);
         buffer.putShort((short) 0); //bodysize
         buffer.put(transactionid);
         return buffer;