commit | e9b7a02ff9d5a0e2f62004eccb26ed9280990f97 | [log] [tgz] |
---|---|---|
author | Jimmy Jin <jjin95032@gmail.com> | Fri Aug 12 16:56:48 2016 -0700 |
committer | Thomas Vachuska <tom@onlab.us> | Fri May 19 15:40:12 2017 +0000 |
tree | 4b92fa14b6924ebca5dbe4e9145e00bf279b51f7 | |
parent | 239f09e2f920a3ab0f15a90e88fdc6c3701f2403 [diff] [blame] |
OpenFlow message processing for new loxi Depends-On: Id69c8597eb4564653c56cdc90f2dcec50afbdd25 Change-Id: Ib14fbadd3debf98ce1d56343179f8e7929f8ade8
diff --git a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java index abb63f1..727301f 100644 --- a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java +++ b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java
@@ -18,6 +18,8 @@ import java.util.List; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; @@ -46,13 +48,16 @@ size += ofm.getLengthU(); }*/ - ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); + ByteBuf bb = Unpooled.buffer(); for (OFMessage ofm : msglist) { if (ofm != null) { - ofm.writeTo(buf); + ofm.writeTo(bb); } } + + ChannelBuffer buf = ChannelBuffers.wrappedBuffer(bb.nioBuffer()); + return buf; }