* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Copyright (c) 2012, 2013, Intel Corporation.
*/
#ifdef HAVE_CONFIG_H
#include <epan/dissectors/packet-tcp.h>
#include <epan/dissectors/packet-infiniband.h>
+/* This value inidcates whether we are processing an Infiniband packet, or
+ TCP. It gets set to the extra bytes the IB header requires if IB,
+ or zero if TCP. */
+static guint ib_lnd_extra_bytes;
+
/* How much data has at least to be available to be able to determine the
* length of the lnet message.
* Note: This is only used for TCP-based LNet packets. Not used for Infiniband.
*/
#define LNET_HEADER_LEN 52
-#define LNET_NID_DEST_OFFSET 24
-#define LNET_NID_SRC_OFFSET 32
-#define LNET_MSG_TYPE_OFFSET 48
-#define LNET_PTL_INDEX_OFFSET_PUT 88
+#define LNET_NID_DEST_OFFSET (24 + ib_lnd_extra_bytes)
+#define LNET_NID_SRC_OFFSET (32 + ib_lnd_extra_bytes)
+#define LNET_MSG_TYPE_OFFSET (48 + ib_lnd_extra_bytes)
+#define LNET_PTL_INDEX_OFFSET_PUT (88 + ib_lnd_extra_bytes)
+
+#define EXTRA_IB_HEADER_SIZE 24
/* TCP ports used for LNet. */
static guint global_lnet_tcp_port = 988;
static guint lnet_tcp_port = 988;
-/* This boolean inidcates whether we are processing an Infiniband packet, or
- TCP. */
-static guint ib_packet;
-
void proto_reg_handoff_lnet(void);
/* Define the lnet proto */
if (!csum)
proto_tree_add_text(tree, tvb, offset, 4, "Checksum Disabled");
else {
- if (ib_packet)
+ if (ib_lnd_extra_bytes)
proto_tree_add_item(tree, hf_lnet_ib_csum, tvb, offset,
4, little_endian);
else
guint32 plen;
/* Get the payload length */
- plen = tvb_get_letohl(tvb,offset+28+24); /* 24 = ksm header,
+ plen = tvb_get_letohl(tvb, offset + 28 + 24 + ib_lnd_extra_bytes);
+ /* 24 = ksm header,
28 = the rest of the
headers */
/* That length doesn't include the header; add that in. */
- return plen + 72 +24 ; /* +24 == ksock msg header.. :D */
+ return plen + 72 + 24 + ib_lnd_extra_bytes; /* +24 == ksock msg
+ header.. :D */
}
/* TODO : correct this, now we do a difference between packet with
NOOP and others .. but I don't find how to use pdu_dissect with
a variable length<=LNET_HEADER_LEN */
- ib_packet = 0;
+ ib_lnd_extra_bytes = 0;
switch(tvb_get_letohl(tvb,0)){
case KSOCK_MSG_NOOP:
- /*g_print("ksock noop %d \n", pinfo->fd->num);*/
tcp_dissect_pdus(tvb,pinfo,tree,TRUE,0, get_noop_message_len,dissect_ksock_msg_noop);
break;
case KSOCK_MSG_LNET:
}
static int
-dissect_ib_lnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_ib_lnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*data)
{
/* We can tell if this is an LNet payload by looking at the first
* 32-bit word for our magic number. */
return 0;
}
- ib_packet = 1;
- dissect_lnet_message(tvb, pinfo, tree);
+ ib_lnd_extra_bytes = EXTRA_IB_HEADER_SIZE;
+ tcp_dissect_pdus(tvb, pinfo, tree, TRUE, LNET_HEADER_LEN,
+ get_lnet_message_len, dissect_lnet_message);
return tvb_length(tvb);
}
guint64 match;
guint32 msg_type;
-
+/*
lnet_request_val_t* conversation_val ;
-
+*/
if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Lnet");
}
lnet_tree = proto_item_add_subtree(ti,ett_lnet); /* add the subtree*/
- if (ib_packet) {
+ if (ib_lnd_extra_bytes) {
offset = dissect_ib_msg(tvb, lnet_tree, offset);
if (offset == 0) {
/* There was no LNet payload, only ob2lnd. */
}
- conversation_val = get_lnet_conv(pinfo , lnet_request_hash, match );
- /* proto_tree_add_text(tree, tvb, 0 , 0, "match = %" G_GINT64_MODIFIER "u parent = %d", conversation_val -> match_bits , conversation_val -> packet_num_parent); */
+ /* conversation_val = */
+ get_lnet_conv(pinfo , lnet_request_hash, match );
+ /* proto_tree_add_text(tree, tvb, 0 , 0, "match = %"
+ G_GINT64_MODIFIER "u parent = %d",
+ conversation_val -> match_bits ,
+ conversation_val -> packet_num_parent); */
/* padding */
- msg_filler_length = 72 - offset + 24 ;
+ msg_filler_length = 72 - offset + 24 + ib_lnd_extra_bytes;
if ( msg_filler_length > 72)
return ;
/* +24 : ksosck_message take 24bytes, and allready in offset */
next_tvb = tvb_new_subset (tvb, offset, payload_length, payload_length);
if(msg_type==LNET_MSG_PUT)
- dissector_try_port(subdissector_table, tvb_get_letohl(tvb,LNET_PTL_INDEX_OFFSET_PUT), next_tvb, pinfo, tree);
+ dissector_try_uint(subdissector_table, tvb_get_letohl(tvb,LNET_PTL_INDEX_OFFSET_PUT), next_tvb, pinfo, tree);
}
lnet_prefs_initialized = TRUE;
}
else
- dissector_delete("tcp.port",global_lnet_tcp_port, lnet_handle);
+ dissector_delete_uint("tcp.port", global_lnet_tcp_port, lnet_handle);
lnet_tcp_port = global_lnet_tcp_port;
- dissector_add("tcp.port", lnet_tcp_port, lnet_handle);
+ dissector_add_uint("tcp.port", lnet_tcp_port, lnet_handle);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff