Hi Eshed,
2014-03-29 20:30 GMT+01:00 Guy Harris <guy@xxxxxxxxxxxx>:
>
> On Mar 29, 2014, at 6:10 AM, Eshed Shaham <ashdnazg@xxxxxxxxx> wrote:
>
>> Hello,
>>
>> I recently found out that the frame_data structure had a minor change in the 1.8 branch between 1.8.8 and 1.8.9:
>> https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blobdiff;f=epan/frame_data.h;h=5ab320541760d412a11ad23422e29b8b8e88635e;hp=dc4f177a34f5a1cd00c2d754f63440301db42f09;hb=0a28fb8f6a354aa9a446b6bf70733c305534e074;hpb=27b5d556cb53bee24e20a9bb5862189ee2e55a61
>
> Are you certain of that?
>
> I downloaded the 1.8.8 and 1.8.9 source tarballs and unpacked them, and:
>
> $ diff wireshark-1.8.8/epan/frame_data.h wireshark-1.8.9/epan/frame_data.h
> $
>
> there's no difference between them.
>
> And, in a 1.8-branch repository:
>
> $ git diff wireshark-1.8.0 wireshark-1.8.13 epan/frame_data.h
> $
>
> so I'm not seeing any changes to epan/frame_data.h at all in the 1.8 branch.
The referred change has been done before branching off 1.8:
rbalint@chaos:~/projects/wireshark.git$ git show
0a28fb8f6a354aa9a446b6bf70733c305534e074 --stat
commit 0a28fb8f6a354aa9a446b6bf70733c305534e074
Author: Gerald Combs <gerald@xxxxxxxxxxxxx>
Date: Tue Oct 30 19:21:24 2012 +0000
Update the Qt byte view widget to reflect the recent changes in the GTK+
byte view.
Move the packet_char_enc enum from packet.h to frame_data.h. Make the
encoding flag a packet_char_enc and make it one bit.
Get rid of the "cfile" global in a few places. C++-ize some of the font
code. Clean up some variable names.
svn path=/trunk/; revision=45838
epan/frame_data.h | 11 +-
epan/packet.h | 6 --
ui/qt/byte_view_tab.cpp | 113 +++++++++++++++++---
ui/qt/byte_view_tab.h | 6 +-
ui/qt/byte_view_text.cpp | 838
+++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------
ui/qt/byte_view_text.h | 58 ++++++++--
ui/qt/main_window.cpp | 5 +
ui/qt/main_window.h | 1 +
ui/qt/main_window_slots.cpp | 2 +
ui/qt/monospace_font.cpp | 36 +++----
ui/qt/monospace_font.h | 4 +-
ui/qt/packet_list.cpp | 47 ++++----
ui/qt/packet_list.h | 2 +
ui/qt/packet_list_model.cpp | 39 ++++---
ui/qt/packet_list_model.h | 5 +-
ui/qt/proto_tree.cpp | 5 +-
ui/qt/wireshark_application.h | 1 +
17 files changed, 548 insertions(+), 631 deletions(-)
rbalint@chaos:~/projects/wireshark.git$ git branch --contains
0a28fb8f6a354aa9a446b6bf70733c305534e074 -a | grep gerrit
remotes/gerrit/master
remotes/gerrit/master-1.10
remotes/gerrit/master-1.8
Changes to Wireshark's ABI can be tracked here:
http://upstream-tracker.org/versions/wireshark.html
We try to do our best in keeping the ABI stable in each release branch.
Cheers,
Balint
