Wireshark-dev: Re: [Wireshark-dev] Patch: Improvements for TIPC dissector package-tipc.c
Hi Jaap,
thanks for the remarks! Till now I wasn't delivering many patches of
that extend.
I cleaned things up a little bit:
1. Don't know why I sent a tar.gz guess my brain I had
an interrupt while I was compressing the file :-)
2. I didn't see Anders Borman updated packet-tipc.c.
We discussed making the info column more conceise
but I understood he wouln't go to change something in
the near future. I adapted my code to Anders' version
and the patch does now apply to to current version in svn.
3. I divided the patch in 2 parts:
a. packet-tipc-svn-ignorews.patch.gz
Here are the actual changes to the code.
Explanation below!
b. packet-tipc-patched-whitespaces.patch.gz
Here are whitespaces removed/added.
This is applied after a!
------------------------------------------------------
A short explanation of packet-tipc-svn-ignorews.patch:
From top till
@@ -498,7 +520,7 @@
there are mainly changes that make what is shown in the info column
more conceise.
Also the end of the initializers are cleaned up
then in the next section till
@@ -516,62 +538,85 @@
there is the "packet_info *pinfo" argument removed which caused
warnings while building because it's not used
then in the next section till
@@ -662,61 +707,55 @@
is where the info column is written. How it is done is a fist
approach, discussed with people from the TIPC mailing list. For sure
there can be more improvements.
then till
@@ -1027,10 +1134,9 @@
the internal header is dissected according to the current protocol
spec available at
http://tipc.sourceforge.net/documentation.html
then till
@@ -1477,10 +1577,25 @@
there is that "pinfo" from above removed. The "error" field in the
info column is handled where the other entries for the info column are
done.
then in the next section till
@@ -1517,7 +1632,7 @@
there is determined if it's an interal or payload header (instead of
in tipc_v2_set_col_msgtype()) and if the info column is to be set (and
this is not done anymore every time tipc_v2_set_col_msgtype() but only
once and then tipc_v2_set_info_col() is called).
then till
@@ -1776,17 +1891,17 @@
that "pinfo" thing
then till
@@ -2166,8 +2326,8 @@
should be obvious
then in the next section till the end
this setting only applies to TIPCv1...
------------------------------------------------------
If anything is not clear, please feel free to get back to me!
Best Regards,
Martin
On 9/28/06, Jaap Keuter <jaap.keuter@xxxxxxxxx> wrote:
Hi Martin,
Some remarks:
1. The attachement was a actually a tar.gz
2. It's a BIG patch
3. It doesn't apply cleanly to the HEAD
so, if you could:
1. send a 2 patch set, with
a. protocol changes relative to HEAD first, for easier review
b. cleanup changes to patched HEAD second.
2. also cleanup the end of the initializers, the last element shall not
have a trailing comma.
Thanx,
Jaap
On Thu, 28 Sep 2006, Martin Peylo wrote:
> Hi,
>
> The attached patch (against wireshark 0.99.3a) mainly
> improves following aspects of the TIPC dissector:
>
> - dissection of TIPCv2 internal messages now shows
> all fields used according to the protocol spec
> - there should be no issues with the current protocol
> spec anymore
> - the info column is more concise and gives more
> details
> - some code beautifications
>
> Could someone please review it and - if ok - commit it?
>
> If there are any issues left or raised please CC a mail to:
> martin <dot> peylo <at> siemens <dot> com
>
> Thanks,
> Martin Peylo
>
_______________________________________________
Wireshark-dev mailing list
Wireshark-dev@xxxxxxxxxxxxx
http://www.wireshark.org/mailman/listinfo/wireshark-dev
Attachment:
packet-tipc-patched-whitespaces.patch.gz
Description: GNU Zip compressed data
Attachment:
packet-tipc-svn-ignorews.patch.gz
Description: GNU Zip compressed data
