Add RPCoRDMA dissector

Add support for RPCoRDMA and as a result support NFSoRDMA protocol

Bug:11251

Change-Id: I1a4af1b4e6b344224f5ce0efa77d7dbfca8aae46
Signed-off-by: Slava Shwartsman <slavash@mellanox.com>
Signed-off-by: Yan Burman <yanb@mellanox.com>
Reviewed-on: https://code.wireshark.org/review/8758
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

4 files changed, 649 insertions, 0 deletions

diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 77940ce2d0..c49c106cd5 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -176,6 +176,7 @@ Thrift
 IP Detail Record (IPDR)
 Performance Co-Pilot Proxy
 Aeron
+Network File System over Remote Direct Memory Access (NFSoRDMA)
 --sort-and-group--
 
 === Updated Protocol Support
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index be40704eec..dbd6448012 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1200,6 +1200,7 @@ set(DISSECTOR_SRC
 	dissectors/packet-roofnet.c
 	dissectors/packet-rpc.c
 	dissectors/packet-rpcap.c
+	dissectors/packet-rpcrdma.c
 	dissectors/packet-rpki-rtr.c
 	dissectors/packet-rpl.c
 	dissectors/packet-rquota.c
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 23907ad697..91bf816797 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -1113,6 +1113,7 @@ DISSECTOR_SRC = \
 	packet-roofnet.c	\
 	packet-rpc.c		\
 	packet-rpcap.c		\
+	packet-rpcrdma.c	\
 	packet-rpki-rtr.c	\
 	packet-rpl.c		\
 	packet-rquota.c		\
diff --git a/epan/dissectors/packet-rpcrdma.c b/epan/dissectors/packet-rpcrdma.c
new file mode 100644
index 0000000000..04b3d42473
--- /dev/null
+++ b/epan/dissectors/packet-rpcrdma.c
@@ -0,0 +1,646 @@
+/* packet-rpcordma.c
+ * Routines for RPC over RDMA dissection (RFC 5666)
+ * Copyright 2014-2015, Mellanox Technologies Ltd.
+ * Code by Yan Burman.
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <errno.h>
+
+#include <epan/packet.h>
+#include <epan/prefs.h>
+#include <epan/conversation.h>
+#include <epan/addr_resolv.h>
+
+#include "packet-infiniband.h"
+
+#define MIN_RPCRDMA_HDR_SZ 16
+#define MIN_RPCRDMA_MSG_SZ (MIN_RPCRDMA_HDR_SZ + 12)
+#define MIN_RPCRDMA_MSGP_SZ (MIN_RPCRDMA_MSG_SZ + 8)
+
+#define SID_ULP_MASK   0x00000000FF000000
+#define SID_PROTO_MASK 0x0000000000FF0000
+#define SID_PORT_MASK  0x000000000000FFFF
+
+#define SID_ULP         0x01
+#define SID_PROTO_TCP   0x06
+#define TCP_PORT_RPCRDMA_RANGE    "20049,2050"
+
+#define SID_MASK (SID_ULP_MASK | SID_PROTO_MASK)
+#define SID_ULP_TCP ((SID_ULP << 3 * 8) | (SID_PROTO_TCP << 2 * 8))
+
+void proto_reg_handoff_rpcordma(void);
+void proto_register_rpcordma(void);
+
+static int proto_rpcordma = -1;
+static dissector_handle_t ib_handler;
+static dissector_handle_t data_handler;
+static dissector_handle_t rpc_handler;
+static dissector_handle_t rpcordma_handler;
+static int proto_ib = -1;
+
+/* RPCoRDMA Header */
+static int hf_rpcordma = -1;
+static int hf_rpcordma_xid = -1;
+static int hf_rpcordma_vers = -1;
+static int hf_rpcordma_flow_control = -1;
+static int hf_rpcordma_message_type = -1;
+
+/* chunks */
+static int hf_rpcordma_reads_count = -1;
+static int hf_rpcordma_writes_count = -1;
+static int hf_rpcordma_reply_count = -1;
+
+static int hf_rpcordma_position = -1;
+
+/* rdma_segment */
+static int hf_rpcordma_rdma_handle = -1;
+static int hf_rpcordma_rdma_length = -1;
+static int hf_rpcordma_rdma_offset = -1;
+
+static int hf_rpcordma_rdma_align = -1;
+static int hf_rpcordma_rdma_thresh = -1;
+
+static int hf_rpcordma_errcode = -1;
+static int hf_rpcordma_vers_high = -1;
+static int hf_rpcordma_vers_low = -1;
+
+/* Initialize the subtree pointers */
+static gint ett_rpcordma = -1;
+static gint ett_rpcordma_chunk = -1;
+
+/* global preferences */
+static gboolean gPREF_MAN_EN    = FALSE;
+static gint gPREF_TYPE[2]       = {0};
+static const char *gPREF_ID[2]  = {NULL};
+static guint gPREF_QP[2]        = {0};
+static range_t *gPORT_RANGE;
+
+/* source/destination addresses from preferences menu (parsed from gPREF_TYPE[?], gPREF_ID[?]) */
+static address manual_addr[2];
+static void *manual_addr_data[2];
+
+static const enum_val_t pref_address_types[] = {
+    {"lid", "LID", 0},
+    {"gid", "GID", 1},
+    {NULL, NULL, -1}
+};
+
+enum MSG_TYPE {
+    RDMA_MSG,
+    RDMA_NOMSG,
+    RDMA_MSGP,
+    RDMA_DONE,
+    RDMA_ERROR
+};
+
+static const value_string rpcordma_message_type[] = {
+    {RDMA_MSG, "RDMA_MSG"},
+    {RDMA_NOMSG, "RDMA_NOMSG"},
+    {RDMA_MSGP, "RDMA_MSGP"},
+    {RDMA_DONE, "RDMA_DONE"},
+    {RDMA_ERROR, "RDMA_ERROR"},
+    {0, NULL}
+};
+
+#define ERR_VERS  1
+#define ERR_CHUNK 2
+
+static const value_string rpcordma_err[] = {
+    {ERR_VERS, "ERR_VERS"},
+    {ERR_CHUNK, "ERR_CHUNK"},
+    {0, NULL}
+};
+
+static guint parse_list(tvbuff_t *tvb, guint offset, proto_tree *tree,
+        int hf_item, const char* msg, int have_position)
+{
+    proto_item *fitem;
+    proto_tree *ftree;
+    guint32 arr_len, i, val, j;
+
+    arr_len = tvb_get_ntohl(tvb, offset);
+    fitem = proto_tree_add_uint_format(tree, hf_item, tvb, offset, 4, arr_len,
+        "%s (count: %u)", msg, arr_len);
+    offset += 4;
+
+    ftree = proto_item_add_subtree(fitem, ett_rpcordma_chunk);
+
+    for (i = 0; i < arr_len; ++i) {
+        val = tvb_get_ntohl(tvb, offset);
+        offset += 4;
+        for (j = 0; j < val; ++j) {
+            if (have_position) {
+                proto_tree_add_item(ftree, hf_rpcordma_position, tvb,
+                            offset, 4, ENC_BIG_ENDIAN);
+                offset += 4;
+            }
+
+            /* xdr_rdma_segment */
+            proto_tree_add_item(ftree, hf_rpcordma_rdma_handle, tvb,
+                        offset, 4, ENC_BIG_ENDIAN);
+            offset += 4;
+            proto_tree_add_item(ftree, hf_rpcordma_rdma_length, tvb,
+                        offset, 4, ENC_BIG_ENDIAN);
+            offset += 4;
+            proto_tree_add_item(ftree, hf_rpcordma_rdma_offset, tvb,
+                        offset, 8, ENC_BIG_ENDIAN);
+            offset += 8;
+        }
+    }
+
+    return offset;
+}
+
+static guint parse_rdma_header(tvbuff_t *tvb, guint offset, proto_tree *tree)
+{
+    offset = parse_list(tvb, offset, tree, hf_rpcordma_reads_count, "Reads", 1);
+    offset = parse_list(tvb, offset, tree, hf_rpcordma_writes_count, "Writes", 0);
+    offset = parse_list(tvb, offset, tree, hf_rpcordma_reply_count, "Reply", 0);
+    return offset;
+}
+
+static int get_chunk_len(tvbuff_t *tvb, guint offset, guint len, int have_position, guint *res)
+{
+    guint32 arr_len, i, val, j;
+
+    arr_len = tvb_get_ntohl(tvb, offset);
+    offset += 4;
+
+    for (i = 0; i < arr_len; ++i) {
+        if (offset + 4 > len)
+            return -1;
+        val = tvb_get_ntohl(tvb, offset);
+        offset += 4;
+        for (j = 0; j < val; ++j) {
+            if (have_position)
+                offset += 4;
+            /* xdr_rdma_segment */
+            offset += 16; /* handle + length + offset */
+            if (offset > len)
+                return -1;
+        }
+    }
+    if (offset > len)
+        return -1;
+
+    *res = offset;
+    return 0;
+}
+
+static int get_chunks_len(tvbuff_t *tvb, guint offset, guint len, guint *res)
+{
+    int ret;
+
+    ret = get_chunk_len(tvb, offset, len, 1, res);
+    if (ret)
+        return ret;
+
+    ret = get_chunk_len(tvb, *res, len, 0, res);
+    if (ret)
+        return ret;
+
+    return get_chunk_len(tvb, *res, len, 0, res);
+}
+
+/*
+ * We need to differentiate between RPC messages inside RDMA and regular send messages.
+ * In order to do that (as well as extra validation) we want to verify that for RDMA_MSG
+ * and RDMA_MSGP types, RPC call or RPC reply header follows. We can do this by comparing
+ * XID in RPC and RPCoRDMA headers.
+ */
+static int packet_is_rpcordma(tvbuff_t *tvb)
+{
+    guint len = tvb_reported_length(tvb);
+    guint32 xid_rpc, xid = tvb_get_ntohl(tvb, 0);
+    guint32 msg_type = tvb_get_ntohl(tvb, 12);
+    guint offset;
+
+    switch (msg_type) {
+    case RDMA_MSG:
+        if (len < MIN_RPCRDMA_MSG_SZ)
+            return 0;
+        if (get_chunks_len(tvb, MIN_RPCRDMA_HDR_SZ, len, &offset))
+            return 0;
+
+        if (offset + 4 > len)
+            return 0;
+        xid_rpc = tvb_get_ntohl(tvb, offset);
+        if (xid != xid_rpc)
+            return 0;
+        break;
+
+    case RDMA_MSGP:
+        if (len < MIN_RPCRDMA_MSGP_SZ)
+            return 0;
+        if (get_chunks_len(tvb, MIN_RPCRDMA_HDR_SZ + 8, len, &offset))
+            return 0;
+
+        if (offset + 4 > len)
+            return 0;
+        xid_rpc = tvb_get_ntohl(tvb, offset);
+        if (xid != xid_rpc)
+            return 0;
+        break;
+    }
+
+    return 1;
+}
+
+static int dissect_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+    tvbuff_t *next_tvb;
+    /* Set up structures needed to add the protocol subtree and manage it */
+    proto_item *ti;
+    proto_tree *rpcordma_tree;
+    guint offset = 0;
+    guint32 xid = tvb_get_ntohl(tvb, 0);
+    guint32 vers = tvb_get_ntohl(tvb, 4);
+    guint32 msg_type = tvb_get_ntohl(tvb, 12);
+    guint len = tvb_reported_length(tvb);
+    guint32 val;
+
+    if (len < MIN_RPCRDMA_HDR_SZ)
+        return 0;
+
+    if (vers != 1)
+        return 0;
+
+    if (msg_type > RDMA_ERROR)
+        return 0;
+
+    if (!packet_is_rpcordma(tvb))
+        return call_dissector(rpc_handler, tvb, pinfo, tree);
+
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "RPCoRDMA");
+    /* Clear out stuff in the info column */
+    col_clear(pinfo->cinfo, COL_INFO);
+
+    col_add_fstr(pinfo->cinfo, COL_INFO, "%s XID 0x%x",
+        val_to_str(msg_type, rpcordma_message_type, "Unknown (%d)"), xid);
+
+    if (tree) {
+        /* create display subtree for the protocol */
+        ti = proto_tree_add_item(tree, hf_rpcordma, tvb, 0, MIN_RPCRDMA_HDR_SZ, ENC_NA);
+
+        rpcordma_tree = proto_item_add_subtree(ti, ett_rpcordma);
+
+        proto_tree_add_item(rpcordma_tree, hf_rpcordma_xid, tvb,
+                    offset, 4, ENC_BIG_ENDIAN);
+        offset += 4;
+        proto_tree_add_item(rpcordma_tree, hf_rpcordma_vers, tvb,
+                    offset, 4, ENC_BIG_ENDIAN);
+        offset += 4;
+        proto_tree_add_item(rpcordma_tree, hf_rpcordma_flow_control, tvb,
+                    offset, 4, ENC_BIG_ENDIAN);
+        offset += 4;
+        proto_tree_add_item(rpcordma_tree, hf_rpcordma_message_type, tvb,
+                    offset, 4, ENC_BIG_ENDIAN);
+        offset += 4;
+
+        switch (msg_type) {
+        case RDMA_MSG:
+            /* Parse rpc_rdma_header */
+            offset = parse_rdma_header(tvb, offset, rpcordma_tree);
+
+            next_tvb = tvb_new_subset_remaining(tvb, offset);
+            return call_dissector(rpc_handler, next_tvb, pinfo, tree);
+
+        case RDMA_NOMSG:
+            /* Parse rpc_rdma_header_nomsg */
+            offset = parse_rdma_header(tvb, offset, rpcordma_tree);
+            break;
+
+        case RDMA_MSGP:
+            /* Parse rpc_rdma_header_padded */
+            proto_tree_add_item(rpcordma_tree, hf_rpcordma_rdma_align, tvb,
+                        offset, 4, ENC_BIG_ENDIAN);
+            offset += 4;
+
+            proto_tree_add_item(rpcordma_tree, hf_rpcordma_rdma_thresh, tvb,
+                        offset, 4, ENC_BIG_ENDIAN);
+            offset += 4;
+
+            offset = parse_rdma_header(tvb, offset, rpcordma_tree);
+
+            next_tvb = tvb_new_subset_remaining(tvb, offset);
+            return call_dissector(rpc_handler, next_tvb, pinfo, tree);
+
+        case RDMA_DONE:
+            break;
+
+        case RDMA_ERROR:
+            /* rpc_rdma_errcode */
+            val = tvb_get_ntohl(tvb, offset);
+            proto_tree_add_item(rpcordma_tree, hf_rpcordma_errcode, tvb,
+                        offset, 4, ENC_BIG_ENDIAN);
+            offset += 4;
+
+            switch (val) {
+            case ERR_VERS:
+                proto_tree_add_item(rpcordma_tree, hf_rpcordma_vers_low, tvb,
+                            offset, 4, ENC_BIG_ENDIAN);
+                offset += 4;
+                proto_tree_add_item(rpcordma_tree, hf_rpcordma_vers_high, tvb,
+                            offset, 4, ENC_BIG_ENDIAN);
+                offset += 4;
+                break;
+
+            case ERR_CHUNK:
+                break;
+
+            default:
+                next_tvb = tvb_new_subset_remaining(tvb, offset);
+                return call_dissector(data_handler, next_tvb, pinfo, tree);
+            }
+            break;
+        }
+    }
+
+    return offset;
+}
+
+static int
+dissect_rpcordma(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+        void *data _U_)
+{
+    return dissect_packet(tvb, pinfo, tree);
+}
+
+static int
+dissect_rpcordma_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+        void *data _U_)
+{
+    conversation_t *conv;
+    conversation_infiniband_data *convo_data = NULL;
+
+    if (gPREF_MAN_EN) {
+        /* If the manual settings are enabled see if this fits - in which case we can skip
+           the following checks entirely and go straight to dissecting */
+        if (    (ADDRESSES_EQUAL(&pinfo->src, &manual_addr[0]) &&
+                 ADDRESSES_EQUAL(&pinfo->dst, &manual_addr[1]) &&
+                 (pinfo->srcport == 0xffffffff /* is unknown */ || pinfo->srcport == gPREF_QP[0]) &&
+                 (pinfo->destport == 0xffffffff /* is unknown */ || pinfo->destport == gPREF_QP[1]))    ||
+                (ADDRESSES_EQUAL(&pinfo->src, &manual_addr[1]) &&
+                 ADDRESSES_EQUAL(&pinfo->dst, &manual_addr[0]) &&
+                 (pinfo->srcport == 0xffffffff /* is unknown */ || pinfo->srcport == gPREF_QP[1]) &&
+                 (pinfo->destport == 0xffffffff /* is unknown */ || pinfo->destport == gPREF_QP[0]))    )
+            return dissect_packet(tvb, pinfo, tree);
+    }
+
+    /* first try to find a conversation between the two current hosts. in most cases this
+       will not work since we do not have the source QP. this WILL succeed when we're still
+       in the process of CM negotiations */
+    conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
+                             PT_IBQP, pinfo->srcport, pinfo->destport, 0);
+
+    if (!conv) {
+        /* if not, try to find an established RC channel. recall Infiniband conversations are
+           registered with one side of the channel. since the packet is only guaranteed to
+           contain the qpn of the destination, we'll use this */
+        conv = find_conversation(pinfo->fd->num, &pinfo->dst, &pinfo->dst,
+                                 PT_IBQP, pinfo->destport, pinfo->destport, NO_ADDR_B|NO_PORT_B);
+
+        if (!conv)
+            return 0;   /* nothing to do with no conversation context */
+    }
+
+    convo_data = (conversation_infiniband_data *)conversation_get_proto_data(conv, proto_ib);
+
+    if (!convo_data)
+        return 0;
+
+    if ((convo_data->service_id & SID_MASK) != SID_ULP_TCP)
+        return 0;   /* the service id doesn't match that of TCP ULP - nothing for us to do here */
+
+    if (!(value_is_in_range(gPORT_RANGE, (guint32)(convo_data->service_id & SID_PORT_MASK))))
+        return 0;   /* the port doesn't match that of RPCoRDMA - nothing for us to do here */
+
+    conv = find_or_create_conversation(pinfo);
+    conversation_set_dissector(conv, rpcordma_handler);
+
+    return dissect_packet(tvb, pinfo, tree);
+}
+
+void
+proto_register_rpcordma(void)
+{
+    module_t *rpcordma_module;
+    static hf_register_info hf[] = {
+        { &hf_rpcordma, {
+            "RPCoRDMA", "rpcordma",
+            FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}
+        },
+        { &hf_rpcordma_xid,
+            { "XID", "rpcordma.xid",
+               FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
+        },
+        { &hf_rpcordma_vers,
+            { "Version", "rpcordma.version",
+               FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
+        },
+        { &hf_rpcordma_flow_control,
+            { "Flow Control", "rpcordma.flow_control",
+               FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
+        },
+        { &hf_rpcordma_message_type,
+            { "Message Type", "rpcordma.msg_type",
+               FT_UINT32, BASE_HEX,
+               VALS(rpcordma_message_type), 0x0, NULL, HFILL}
+        },
+    { &hf_rpcordma_reads_count,
+            { "Read list", "rpcordma.reads_count",
+                FT_UINT32, BASE_DEC,
+        NULL, 0, NULL, HFILL }
+        },
+    { &hf_rpcordma_writes_count,
+            { "Write list", "rpcordma.writes_count",
+                FT_UINT32, BASE_DEC,
+        NULL, 0, NULL, HFILL }
+        },
+    { &hf_rpcordma_reply_count,
+            { "Reply list", "rpcordma.reply_count",
+                FT_UINT32, BASE_DEC,
+        NULL, 0, NULL, HFILL }
+        },
+    { &hf_rpcordma_rdma_handle,
+            { "RDMA handle", "rpcordma.rdma_handle",
+                FT_UINT32, BASE_HEX,
+        NULL, 0, NULL, HFILL }
+        },
+    { &hf_rpcordma_rdma_length,
+            { "RDMA length", "rpcordma.rdma_length",
+                FT_UINT32, BASE_HEX,
+        NULL, 0, NULL, HFILL }
+        },
+    { &hf_rpcordma_rdma_offset,
+            { "RDMA offset", "rpcordma.rdma_offset",
+                FT_UINT64, BASE_HEX,
+        NULL, 0, NULL, HFILL }
+        },
+    { &hf_rpcordma_position,
+            { "Postion in XDR", "rpcordma.position",
+                FT_UINT32, BASE_HEX,
+        NULL, 0, NULL, HFILL }
+        },
+    { &hf_rpcordma_rdma_align,
+            { "RDMA align", "rpcordma.rdma_align",
+                FT_UINT32, BASE_HEX,
+        NULL, 0, NULL, HFILL }
+        },
+    { &hf_rpcordma_rdma_thresh,
+            { "RDMA threshold", "rpcordma.rdma_thresh",
+                FT_UINT32, BASE_HEX,
+        NULL, 0, NULL, HFILL }
+        },
+    { &hf_rpcordma_errcode,
+            { "Error code", "rpcordma.errcode",
+                FT_UINT32, BASE_HEX,
+        VALS(rpcordma_err), 0, NULL, HFILL }
+        },
+    { &hf_rpcordma_vers_low,
+            { "Version low", "rpcordma.vers_low",
+                FT_UINT32, BASE_HEX,
+        NULL, 0, NULL, HFILL }
+        },
+    { &hf_rpcordma_vers_high,
+            { "Version high", "rpcordma.vers_high",
+                FT_UINT32, BASE_HEX,
+        NULL, 0, NULL, HFILL }
+        },
+    };
+
+    static gint *ett[] = {
+        &ett_rpcordma,
+        &ett_rpcordma_chunk,
+    };
+
+    proto_rpcordma = proto_register_protocol (
+        "RPC over RDMA", /* name       */
+        "RPCoRDMA",      /* short name */
+        "rpcordma"       /* abbrev     */
+        );
+
+    proto_register_field_array(proto_rpcordma, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+
+    /* Register preferences */
+    rpcordma_module = prefs_register_protocol(proto_rpcordma, proto_reg_handoff_rpcordma);
+
+    prefs_register_bool_preference(rpcordma_module, "manual_en", "Enable manual settings",
+        "Check to treat all traffic between the configured source/destination as RPCoRDMA",
+        &gPREF_MAN_EN);
+
+    prefs_register_static_text_preference(rpcordma_module, "addr_a", "Address A",
+        "Side A of the manually-configured connection");
+    prefs_register_enum_preference(rpcordma_module, "addr_a_type", "Address Type",
+        "Type of address specified", &gPREF_TYPE[0], pref_address_types, FALSE);
+    prefs_register_string_preference(rpcordma_module, "addr_a_id", "ID",
+        "LID/GID of address A", &gPREF_ID[0]);
+    prefs_register_uint_preference(rpcordma_module, "addr_a_qp", "QP Number",
+        "QP Number for address A", 10, &gPREF_QP[0]);
+
+    prefs_register_static_text_preference(rpcordma_module, "addr_b", "Address B",
+        "Side B of the manually-configured connection");
+    prefs_register_enum_preference(rpcordma_module, "addr_b_type", "Address Type",
+        "Type of address specified", &gPREF_TYPE[1], pref_address_types, FALSE);
+    prefs_register_string_preference(rpcordma_module, "addr_b_id", "ID",
+        "LID/GID of address B", &gPREF_ID[1]);
+    prefs_register_uint_preference(rpcordma_module, "addr_b_qp", "QP Number",
+        "QP Number for address B", 10, &gPREF_QP[1]);
+
+    range_convert_str(&gPORT_RANGE, TCP_PORT_RPCRDMA_RANGE, MAX_TCP_PORT);
+    prefs_register_range_preference(rpcordma_module,
+                                    "target_ports",
+                                    "Target Ports Range",
+                                    "Range of RPCoRDNA server ports"
+                                    "(default " TCP_PORT_RPCRDMA_RANGE ")",
+                                    &gPORT_RANGE, MAX_TCP_PORT);
+}
+
+void
+proto_reg_handoff_rpcordma(void)
+{
+    static gboolean initialized = FALSE;
+
+    if (!initialized) {
+        rpcordma_handler = new_create_dissector_handle(dissect_rpcordma, proto_rpcordma);
+        heur_dissector_add("infiniband.payload", dissect_rpcordma_heur, proto_rpcordma);
+        heur_dissector_add("infiniband.mad.cm.private", dissect_rpcordma_heur, proto_rpcordma);
+
+        /* allocate enough space in the addresses to store the largest address (a GID) */
+        manual_addr_data[0] = wmem_alloc(wmem_epan_scope(), GID_SIZE);
+        manual_addr_data[1] = wmem_alloc(wmem_epan_scope(), GID_SIZE);
+
+        data_handler = find_dissector("data");
+        rpc_handler = find_dissector("rpc");
+        ib_handler = find_dissector("infiniband");
+        proto_ib = dissector_handle_get_protocol_index(ib_handler);
+
+        initialized = TRUE;
+    }
+
+    if (gPREF_MAN_EN) {
+        /* the manual setting is enabled, so parse the settings into the address type */
+        gboolean error_occured = FALSE;
+        char *not_parsed;
+        int i;
+
+        for (i = 0; i < 2; i++) {
+            if (gPREF_TYPE[i] == 0) {   /* LID */
+                errno = 0;  /* reset any previous error indicators */
+                *((guint16*)manual_addr_data[i]) = (guint16)strtoul(gPREF_ID[i], &not_parsed, 0);
+                if (errno || *not_parsed != '\0') {
+                    error_occured = TRUE;
+                } else {
+                    SET_ADDRESS(&manual_addr[i], AT_IB, sizeof(guint16), manual_addr_data[i]);
+                }
+            } else {    /* GID */
+                if (!str_to_ip6(gPREF_ID[i], manual_addr_data[i]) ) {
+                    error_occured = TRUE;
+                } else {
+                    SET_ADDRESS(&manual_addr[i], AT_IB, GID_SIZE, manual_addr_data[i]);
+                }
+            }
+
+            if (error_occured) {
+                /* an invalid id was specified - disable manual settings until it's fixed */
+                gPREF_MAN_EN = FALSE;
+                break;
+            }
+        }
+    }
+}
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */