date:20141010

Re: [Wireshark-dev] Translation tools

2014-10-10 Thread Dario Lombardo

Ok, thanks. I'm able to start the translation. I've translated a couple of
entries, recompiled, changed the language, and everything is ok: my
translated entries are now in wireshark.
But if now I translate other entries, run lupdate and lrelease, then make,
the ui is not recompiled again. It seems that the ui compilation subsystem
can't notice that I changed the language file so it doesn't recompile it.
If I git stash  make  git stash pop  make, the changes are compiled.
Do I have to issue some magic to force the ui recompilation?
___
Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org
Archives:http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

[Wireshark-dev] DCERPC (idl2wrs pidl)

2014-10-10 Thread Alexis La Goutte

Hi,

Like you have see, i work to fix the last warning on DCERPC generate
dissector...


i have a major question about idl2wrs and Pidl :
There is 2 different tools to generate Wireshark dissector for idl file :
* idl2wrs (in epan/dissectors/dcerpc folder)
* Pidl (in tools and epan/dissectors/pidl).

Somebody known, why there is 2 tools ? (there is a plan to move to
first tools to a another ?)


there is a lot of check about tree (parent_tree) like :
if (parent_tree) {
item = proto_tree_add_item(parent_tree, hf_index, tvb, offset,
-1, TRUE);
tree = proto_item_add_subtree(item, ett_mapi_mapi_request);
}

This check is no longer needed (and may be removed ?)

Also for Pidl, some idl/cnf dissectors files have a subfolder (like
mapi or rfr...)
May be move all pidl files in a subfolder and add Makefiles to
generate (and move/copy files)

Also thanks to Michael to have fix the pidl generator..

Regards,
___
Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org
Archives:http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

Re: [Wireshark-dev] Translation tools

2014-10-10 Thread Alexis La Goutte

On Fri, Oct 10, 2014 at 1:10 PM, Dario Lombardo
dario.lombardo...@gmail.com wrote:
 Ok, thanks. I'm able to start the translation. I've translated a couple of
 entries, recompiled, changed the language, and everything is ok: my
 translated entries are now in wireshark.
 But if now I translate other entries, run lupdate and lrelease, then make,
 the ui is not recompiled again. It seems that the ui compilation subsystem
 can't notice that I changed the language file so it doesn't recompile it. If
 I git stash  make  git stash pop  make, the changes are compiled.
 Do I have to issue some magic to force the ui recompilation?

What plaform are you used for build Wireshark ?
I have never get this problem...
___
Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org
Archives:http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

Re: [Wireshark-dev] RoCE and CM dissector fixes

2014-10-10 Thread Alexis La Goutte

Hi Tim,

Please push your patch on Gerrit
http://wiki.wireshark.org/Development/SubmittingPatches

Regards,

On Fri, Oct 10, 2014 at 9:01 PM, Tim (Thanh) Nguyen
tnngu...@broadcom.com wrote:
 RoCE and CM dissector fixes

 - fixed cm.req cm.rep bit fields
 - fixed packetLength and CRC length for RoCE
 - use RoCE or RRoCE instead of InfiniBand in COL_PROTOCOL where 
 appropriate


 diff --git a/epan/dissectors/packet-infiniband.c 
 b/epan/dissectors/packet-infiniband.c
 index e0a4e12..1f15134 100644
 --- a/epan/dissectors/packet-infiniband.c
 +++ b/epan/dissectors/packet-infiniband.c
 @@ -152,7 +152,7 @@ static void dissect_general_info(tvbuff_t *tvb, gint 
 offset, packet_info *pinfo,
  /* Parsing Methods for specific IB headers. */

  static void parse_VENDOR(proto_tree *, tvbuff_t *, gint *);
 -static void parse_PAYLOAD(proto_tree *, packet_info *, struct infinibandinfo 
 *, tvbuff_t *, gint *, gint length, proto_tree *);
 +static void parse_PAYLOAD(proto_tree *, packet_info *, struct infinibandinfo 
 *, tvbuff_t *, gint *, gint length, gint crclen, proto_tree *);
  static void parse_IETH(proto_tree *, tvbuff_t *, gint *);
  static void parse_IMMDT(proto_tree *, tvbuff_t *, gint *offset);
  static void parse_ATOMICACKETH(proto_tree *, tvbuff_t *, gint *offset);
 @@ -1587,6 +1587,7 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info 
 *pinfo, proto_tree *tree, i
  struct e_in6_addr SRCgid;   /* Structures to hold GIDs should we 
 need them */
  struct e_in6_addr DSTgid;
  gint crc_length = 0;
 +gint crclen = 6;

  void *src_addr, /* the address to be displayed in the 
 source/destination columns */
   *dst_addr; /* (lid/gid number) will be stored here 
 */
 @@ -1609,14 +1610,18 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info 
 *pinfo, proto_tree *tree, i

  if (starts_with == IB_PACKET_STARTS_WITH_GRH) {
  /* this is a RoCE packet, skip LRH parsing */
 +col_set_str(pinfo-cinfo, COL_PROTOCOL, RoCE);
  lnh_val = IBA_GLOBAL;
 -packetLength = tvb_get_ntohs(tvb, 4);   /* since we have no LRH to 
 get PktLen from, use that of the GRH */
 +packetLength = tvb_reported_length_remaining(tvb, offset);
 +crclen = 4;
  goto skip_lrh;
  }
   else if (starts_with == IB_PACKET_STARTS_WITH_BTH) {
   /* this is a RRoCE packet, skip LRH/GRH parsing and go directly to 
 BTH */
 + col_set_str(pinfo-cinfo, COL_PROTOCOL, RRoCE);
   lnh_val = IBA_LOCAL;
   packetLength = tvb_reported_length_remaining(tvb, offset);
 + crclen = 4;
   goto skip_lrh;
   }

 @@ -1802,7 +1807,7 @@ skip_lrh:
  packetLength -= 4; /* RDETH */
  packetLength -= 8; /* DETH */

 -parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, tree);
 +parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, crclen, tree);
  break;
  case RDETH_DETH_RETH_PAYLD:
  parse_RDETH(all_headers_tree, tvb, offset);
 @@ -1813,7 +1818,7 @@ skip_lrh:
  packetLength -= 8; /* DETH */
  packetLength -= 16; /* RETH */

 -parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, tree);
 +parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, crclen, tree);
  break;
  case RDETH_DETH_IMMDT_PAYLD:
  parse_RDETH(all_headers_tree, tvb, offset);
 @@ -1824,7 +1829,7 @@ skip_lrh:
  packetLength -= 8; /* DETH */
  packetLength -= 4; /* IMMDT */

 -parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, tree);
 +parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, crclen, tree);
  break;
  case RDETH_DETH_RETH_IMMDT_PAYLD:
  parse_RDETH(all_headers_tree, tvb, offset);
 @@ -1837,7 +1842,7 @@ skip_lrh:
  packetLength -= 16; /* RETH */
  packetLength -= 4;  /* IMMDT */

 -parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, tree);
 +parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, crclen, tree);
  break;
  case RDETH_DETH_RETH:
  parse_RDETH(all_headers_tree, tvb, offset);
 @@ -1856,14 +1861,14 @@ skip_lrh:
  packetLength -= 4; /* RDETH */
  packetLength -= 4; /* AETH */

 -parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, tree);
 +parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, crclen, tree);
  break;
  case RDETH_PAYLD:
  parse_RDETH(all_headers_tree, tvb, offset);

[Wireshark-dev] RoCE and CM dissector fixes

2014-10-10 Thread Tim (Thanh) Nguyen

RoCE and CM dissector fixes

- fixed cm.req cm.rep bit fields
- fixed packetLength and CRC length for RoCE
- use RoCE or RRoCE instead of InfiniBand in COL_PROTOCOL where 
appropriate


diff --git a/epan/dissectors/packet-infiniband.c 
b/epan/dissectors/packet-infiniband.c
index e0a4e12..1f15134 100644
--- a/epan/dissectors/packet-infiniband.c
+++ b/epan/dissectors/packet-infiniband.c
@@ -152,7 +152,7 @@ static void dissect_general_info(tvbuff_t *tvb, gint 
offset, packet_info *pinfo,
 /* Parsing Methods for specific IB headers. */
 
 static void parse_VENDOR(proto_tree *, tvbuff_t *, gint *);
-static void parse_PAYLOAD(proto_tree *, packet_info *, struct infinibandinfo 
*, tvbuff_t *, gint *, gint length, proto_tree *);
+static void parse_PAYLOAD(proto_tree *, packet_info *, struct infinibandinfo 
*, tvbuff_t *, gint *, gint length, gint crclen, proto_tree *);
 static void parse_IETH(proto_tree *, tvbuff_t *, gint *);
 static void parse_IMMDT(proto_tree *, tvbuff_t *, gint *offset);
 static void parse_ATOMICACKETH(proto_tree *, tvbuff_t *, gint *offset);
@@ -1587,6 +1587,7 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info 
*pinfo, proto_tree *tree, i
 struct e_in6_addr SRCgid;   /* Structures to hold GIDs should we need 
them */
 struct e_in6_addr DSTgid;
 gint crc_length = 0;
+gint crclen = 6;
 
 void *src_addr, /* the address to be displayed in the 
source/destination columns */
  *dst_addr; /* (lid/gid number) will be stored here */
@@ -1609,14 +1610,18 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info 
*pinfo, proto_tree *tree, i
 
 if (starts_with == IB_PACKET_STARTS_WITH_GRH) {
 /* this is a RoCE packet, skip LRH parsing */
+col_set_str(pinfo-cinfo, COL_PROTOCOL, RoCE);
 lnh_val = IBA_GLOBAL;
-packetLength = tvb_get_ntohs(tvb, 4);   /* since we have no LRH to get 
PktLen from, use that of the GRH */
+packetLength = tvb_reported_length_remaining(tvb, offset);
+crclen = 4;
 goto skip_lrh;
 }
  else if (starts_with == IB_PACKET_STARTS_WITH_BTH) {
  /* this is a RRoCE packet, skip LRH/GRH parsing and go directly to 
BTH */
+ col_set_str(pinfo-cinfo, COL_PROTOCOL, RRoCE);
  lnh_val = IBA_LOCAL;
  packetLength = tvb_reported_length_remaining(tvb, offset);
+ crclen = 4;
  goto skip_lrh;
  }
 
@@ -1802,7 +1807,7 @@ skip_lrh:
 packetLength -= 4; /* RDETH */
 packetLength -= 8; /* DETH */
 
-parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
packetLength, tree);
+parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
packetLength, crclen, tree);
 break;
 case RDETH_DETH_RETH_PAYLD:
 parse_RDETH(all_headers_tree, tvb, offset);
@@ -1813,7 +1818,7 @@ skip_lrh:
 packetLength -= 8; /* DETH */
 packetLength -= 16; /* RETH */
 
-parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
packetLength, tree);
+parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
packetLength, crclen, tree);
 break;
 case RDETH_DETH_IMMDT_PAYLD:
 parse_RDETH(all_headers_tree, tvb, offset);
@@ -1824,7 +1829,7 @@ skip_lrh:
 packetLength -= 8; /* DETH */
 packetLength -= 4; /* IMMDT */
 
-parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
packetLength, tree);
+parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
packetLength, crclen, tree);
 break;
 case RDETH_DETH_RETH_IMMDT_PAYLD:
 parse_RDETH(all_headers_tree, tvb, offset);
@@ -1837,7 +1842,7 @@ skip_lrh:
 packetLength -= 16; /* RETH */
 packetLength -= 4;  /* IMMDT */
 
-parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
packetLength, tree);
+parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
packetLength, crclen, tree);
 break;
 case RDETH_DETH_RETH:
 parse_RDETH(all_headers_tree, tvb, offset);
@@ -1856,14 +1861,14 @@ skip_lrh:
 packetLength -= 4; /* RDETH */
 packetLength -= 4; /* AETH */
 
-parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
packetLength, tree);
+parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
packetLength, crclen, tree);
 break;
 case RDETH_PAYLD:
 parse_RDETH(all_headers_tree, tvb, offset);
 
 packetLength -= 4; /* RDETH */
 
-parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
packetLength, tree);
+parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
packetLength, crclen, tree);
 break;

Re: [Wireshark-dev] RoCE and CM dissector fixes

2014-10-10 Thread Tim (Thanh) Nguyen

Hi Alexis,

Sorry, I'm not familiar with Gerrit, and right now my normal work doesn't leave 
me any cycles to learn it for this purpose. If someone else would like to take 
this patch and properly submit it ,then feel free.

Tim.

-Original Message-
From: wireshark-dev-boun...@wireshark.org 
[mailto:wireshark-dev-boun...@wireshark.org] On Behalf Of Alexis La Goutte
Sent: Friday, October 10, 2014 12:13 PM
To: Developer support list for Wireshark
Subject: Re: [Wireshark-dev] RoCE and CM dissector fixes

Hi Tim,

Please push your patch on Gerrit
http://wiki.wireshark.org/Development/SubmittingPatches

Regards,

On Fri, Oct 10, 2014 at 9:01 PM, Tim (Thanh) Nguyen
tnngu...@broadcom.com wrote:
 RoCE and CM dissector fixes

 - fixed cm.req cm.rep bit fields
 - fixed packetLength and CRC length for RoCE
 - use RoCE or RRoCE instead of InfiniBand in COL_PROTOCOL where 
 appropriate


 diff --git a/epan/dissectors/packet-infiniband.c 
 b/epan/dissectors/packet-infiniband.c
 index e0a4e12..1f15134 100644
 --- a/epan/dissectors/packet-infiniband.c
 +++ b/epan/dissectors/packet-infiniband.c
 @@ -152,7 +152,7 @@ static void dissect_general_info(tvbuff_t *tvb, gint 
 offset, packet_info *pinfo,
  /* Parsing Methods for specific IB headers. */

  static void parse_VENDOR(proto_tree *, tvbuff_t *, gint *);
 -static void parse_PAYLOAD(proto_tree *, packet_info *, struct infinibandinfo 
 *, tvbuff_t *, gint *, gint length, proto_tree *);
 +static void parse_PAYLOAD(proto_tree *, packet_info *, struct infinibandinfo 
 *, tvbuff_t *, gint *, gint length, gint crclen, proto_tree *);
  static void parse_IETH(proto_tree *, tvbuff_t *, gint *);
  static void parse_IMMDT(proto_tree *, tvbuff_t *, gint *offset);
  static void parse_ATOMICACKETH(proto_tree *, tvbuff_t *, gint *offset);
 @@ -1587,6 +1587,7 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info 
 *pinfo, proto_tree *tree, i
  struct e_in6_addr SRCgid;   /* Structures to hold GIDs should we 
 need them */
  struct e_in6_addr DSTgid;
  gint crc_length = 0;
 +gint crclen = 6;

  void *src_addr, /* the address to be displayed in the 
 source/destination columns */
   *dst_addr; /* (lid/gid number) will be stored here 
 */
 @@ -1609,14 +1610,18 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info 
 *pinfo, proto_tree *tree, i

  if (starts_with == IB_PACKET_STARTS_WITH_GRH) {
  /* this is a RoCE packet, skip LRH parsing */
 +col_set_str(pinfo-cinfo, COL_PROTOCOL, RoCE);
  lnh_val = IBA_GLOBAL;
 -packetLength = tvb_get_ntohs(tvb, 4);   /* since we have no LRH to 
 get PktLen from, use that of the GRH */
 +packetLength = tvb_reported_length_remaining(tvb, offset);
 +crclen = 4;
  goto skip_lrh;
  }
   else if (starts_with == IB_PACKET_STARTS_WITH_BTH) {
   /* this is a RRoCE packet, skip LRH/GRH parsing and go directly to 
 BTH */
 + col_set_str(pinfo-cinfo, COL_PROTOCOL, RRoCE);
   lnh_val = IBA_LOCAL;
   packetLength = tvb_reported_length_remaining(tvb, offset);
 + crclen = 4;
   goto skip_lrh;
   }

 @@ -1802,7 +1807,7 @@ skip_lrh:
  packetLength -= 4; /* RDETH */
  packetLength -= 8; /* DETH */

 -parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, tree);
 +parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, crclen, tree);
  break;
  case RDETH_DETH_RETH_PAYLD:
  parse_RDETH(all_headers_tree, tvb, offset);
 @@ -1813,7 +1818,7 @@ skip_lrh:
  packetLength -= 8; /* DETH */
  packetLength -= 16; /* RETH */

 -parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, tree);
 +parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, crclen, tree);
  break;
  case RDETH_DETH_IMMDT_PAYLD:
  parse_RDETH(all_headers_tree, tvb, offset);
 @@ -1824,7 +1829,7 @@ skip_lrh:
  packetLength -= 8; /* DETH */
  packetLength -= 4; /* IMMDT */

 -parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, tree);
 +parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, crclen, tree);
  break;
  case RDETH_DETH_RETH_IMMDT_PAYLD:
  parse_RDETH(all_headers_tree, tvb, offset);
 @@ -1837,7 +1842,7 @@ skip_lrh:
  packetLength -= 16; /* RETH */
  packetLength -= 4;  /* IMMDT */

 -parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, tree);
 +parse_PAYLOAD(all_headers_tree, pinfo, info, tvb, offset, 
 packetLength, crclen, tree);
  break;
  case RDETH_DETH_RETH:

Re: [Wireshark-dev] DCERPC (idl2wrs pidl)

2014-10-10 Thread Guy Harris


On Oct 10, 2014, at 5:08 AM, Alexis La Goutte alexis.lagou...@gmail.com wrote:

 i have a major question about idl2wrs and Pidl :
 There is 2 different tools to generate Wireshark dissector for idl file :
 * idl2wrs (in epan/dissectors/dcerpc folder)
 * Pidl (in tools and epan/dissectors/pidl).
 
 Somebody known, why there is 2 tools ? (there is a plan to move to
 first tools to a another ?)

I think the move has already happened:

https://www.wireshark.org/lists/wireshark-dev/201306/msg1.html

I say Delete it.

It is the original proof of concept hack I did before we switched to PIDL.

I abandoned this for PIDL in 2005  and should have deleted it then.

(it being idl2wrs)
___
Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org
Archives:http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

Re: [Wireshark-dev] Translation tools

[Wireshark-dev] DCERPC (idl2wrs pidl)

Re: [Wireshark-dev] Translation tools

Re: [Wireshark-dev] RoCE and CM dissector fixes

[Wireshark-dev] RoCE and CM dissector fixes

Re: [Wireshark-dev] RoCE and CM dissector fixes

Re: [Wireshark-dev] DCERPC (idl2wrs pidl)

7 matches

Site Navigation

Mail list logo

Footer information