[Wireshark-commits] master 7d26339: Revert "RTSE and PRES relies on the TCP conversation to do reassembly, switch to the new interface."

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7d26339a2fa9d8e707eee0f1e8ac61a2affb2e83
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

7d26339 by Anders Broman (a.broma...@gmail.com):

Revert "RTSE and PRES relies on the TCP conversation to do reassembly, 
switch to the new interface."

This reverts commit c296001158b979497242dd726430b0b7cb26f984.

Change-Id: Ie67001c181b1e7437e5d6ecd8f64b61da15df2c3
Reviewed-on: https://code.wireshark.org/review/13823
Reviewed-by: Anders Broman 


Actions performed:

from  22a569a   tools: improve valgrind script.
adds  7d26339   Revert "RTSE and PRES relies on the TCP conversation to do 
reassembly, switch to the new interface."


Summary of changes:
 asn1/pres/packet-pres-template.c |   12 ++--
 asn1/rtse/packet-rtse-template.c |   10 +++---
 epan/dissectors/packet-pres.c|   18 +-
 epan/dissectors/packet-rtse.c|   18 +++---
 4 files changed, 21 insertions(+), 37 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] buildbot failure in Wireshark (development) on OSX 10.6 x64

2016-02-08 Thread buildbot-no-reply 
The Buildbot has detected a new failure on builder OSX 10.6 x64 while building 
wireshark. Full details are available at:

http://buildbot.wireshark.org/wireshark-master/builders/OSX%2010.6%20x64/builds/10169

Buildbot URL: http://buildbot.wireshark.org/wireshark-master/

Buildslave for this Build: osx-10.6-x64

Build Reason: The SingleBranchScheduler scheduler named 'Gerrit' triggered this 
build
Build Source Stamp: [branch master] 56a41845e7aada163a50abaa64df6817d8d2
Blamelist: Anders Broman 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot



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

[Wireshark-commits] master 56a4184: Revert "Create an extended converstaion hastable taking more address information into consideration. This makes it possible to differentiate between packets on diff

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=56a41845e7aada163a50abaa64df6817d8d2
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

56a4184 by Anders Broman (a.broma...@gmail.com):

Revert "Create an extended converstaion hastable taking more address 
information into consideration. This makes it possible to differentiate between 
packets on different vlans and can be expanded to handle tunnels."

This reverts commit f80e9df7939be9d88062718d6c15fa2983e5e605.

Change-Id: I7877b250d479c30209cfe74351069d54359757b5
Reviewed-on: https://code.wireshark.org/review/13825
Reviewed-by: Anders Broman 


Actions performed:

from  7d26339   Revert "RTSE and PRES relies on the TCP conversation to do 
reassembly, switch to the new interface."
adds  56a4184   Revert "Create an extended converstaion hastable taking 
more address information into consideration. This makes it possible to 
differentiate between packets on different vlans and can be expanded to handle 
tunnels."


Summary of changes:
 epan/conversation.c  |  286 +++---
 epan/conversation.h  |   16 +--
 epan/dissectors/packet-tcp.c |   14 ++-
 3 files changed, 28 insertions(+), 288 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master 0f2a0e8: Lua: Remove WSLUA_ERROR on dissecting error

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0f2a0e83fbb701a0836da36c16c162817d4a9b2f
Submitter: Stig Bj?rlykke (s...@bjorlykke.org)
Changed: branch: master
Repository: wireshark

Commits:

0f2a0e8 by Stig Bjørlykke (s...@bjorlykke.org):

Lua: Remove WSLUA_ERROR on dissecting error

On error in Dissector_call and DissectorTable_try we should not
terminate with WSLUA_ERROR because the error is already reported
in the tree with show_exception().

Change-Id: I60739f12cb8b16fe2270f47701286fd0dbf04c6f
Reviewed-on: https://code.wireshark.org/review/13819
Petri-Dish: Stig Bjørlykke 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Stig Bjørlykke 


Actions performed:

from  1b5382c   Qt: Add Show Packet Bytes Dialog
adds  0f2a0e8   Lua: Remove WSLUA_ERROR on dissecting error


Summary of changes:
 epan/wslua/wslua_dissector.c |8 
 1 file changed, 8 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] buildbot failure in Wireshark (development) on Ubuntu 14.04 x64

2016-02-08 Thread buildbot-no-reply 
The Buildbot has detected a new failure on builder Ubuntu 14.04 x64 while 
building wireshark. Full details are available at:

http://buildbot.wireshark.org/wireshark-master/builders/Ubuntu%2014.04%20x64/builds/5453

Buildbot URL: http://buildbot.wireshark.org/wireshark-master/

Buildslave for this Build: ubuntu-14.04-x64

Build Reason: The SingleBranchScheduler scheduler named 'Gerrit' triggered this 
build
Build Source Stamp: [branch master] 56a41845e7aada163a50abaa64df6817d8d2
Blamelist: Anders Broman 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot



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

[Wireshark-commits] master 1b5382c: Qt: Add Show Packet Bytes Dialog

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1b5382caa57555bd73601937d9f08afb179f0228
Submitter: Stig Bj?rlykke (s...@bjorlykke.org)
Changed: branch: master
Repository: wireshark

Commits:

1b5382c by Stig Bjørlykke (s...@bjorlykke.org):

Qt: Add Show Packet Bytes Dialog

Show selected packet bytes as ASCII, HTML, Image, ISO 8859-1, Raw or UTF-8.
Images supported are what's supported by QImage, and HTML supported
is what's supported by QTextEdit.

Change-Id: I96fc5c5d222c5389078576463cf78d82cf55528d
Reviewed-on: https://code.wireshark.org/review/13807
Petri-Dish: Stig Bjørlykke 
Reviewed-by: Stig Bjørlykke 


Actions performed:

from  56a4184   Revert "Create an extended converstaion hastable taking 
more address information into consideration. This makes it possible to 
differentiate between packets on different vlans and can be expanded to handle 
tunnels."
adds  1b5382c   Qt: Add Show Packet Bytes Dialog


Summary of changes:
 docbook/release-notes.asciidoc |1 +
 docbook/wsug_src/WSUG_chapter_advanced.asciidoc|   44 ++-
 ui/help_url.c  |3 +
 ui/help_url.h  |1 +
 ui/qt/CMakeLists.txt   |3 +
 ui/qt/Makefile.am  |2 +
 ui/qt/Makefile.common  |4 +
 ui/qt/Wireshark.pro|3 +
 ui/qt/main_window.h|2 +
 ui/qt/main_window.ui   |5 +
 ui/qt/main_window_slots.cpp|8 +
 ui/qt/proto_tree.cpp   |2 +
 ui/qt/show_packet_bytes_dialog.cpp |  372 
 ui/qt/show_packet_bytes_dialog.h   |  106 ++
 ...tream_dialog.ui => show_packet_bytes_dialog.ui} |   67 +---
 15 files changed, 565 insertions(+), 58 deletions(-)
 create mode 100644 ui/qt/show_packet_bytes_dialog.cpp
 create mode 100644 ui/qt/show_packet_bytes_dialog.h
 copy ui/qt/{follow_stream_dialog.ui => show_packet_bytes_dialog.ui} (54%)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master ddc8a49: Regenerate RTSE dissector.

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ddc8a49d184bfeae232ee2b3984ac83408018eaf
Submitter: Guy Harris (g...@alum.mit.edu)
Changed: branch: master
Repository: wireshark

Commits:

ddc8a49 by Guy Harris (g...@alum.mit.edu):

Regenerate RTSE dissector.

Change-Id: I1662b2b28ff993ec5e4fa8faabe60f76014f7b46
Reviewed-on: https://code.wireshark.org/review/13827
Reviewed-by: Guy Harris 


Actions performed:

from  0f2a0e8   Lua: Remove WSLUA_ERROR on dissecting error
adds  ddc8a49   Regenerate RTSE dissector.


Summary of changes:
 epan/dissectors/packet-rtse.c |   12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master db3795b: Add missing breaks (CID 1348047 .. 1348051)

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=db3795b4fbd03492565156e2864b51053825f76f
Submitter: Alexis La Goutte (alexis.lagou...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

db3795b by Jaap Keuter (jaap.keu...@xs4all.nl):

Add missing breaks (CID 1348047 .. 1348051)

Add missing breaks in ZigBee dissectors.

Change-Id: I26e403e589aa6c0ed7ce5f4574e29a9814ba96c0
Reviewed-on: https://code.wireshark.org/review/13809
Petri-Dish: Anders Broman 
Petri-Dish: Alexis La Goutte 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Alexis La Goutte 


Actions performed:

from  6d88e9e   prefs.c: Fix Dead Store (Dead assignement/Dead increment) 
Warning found by Clang
adds  db3795b   Add missing breaks (CID 1348047 .. 1348051)


Summary of changes:
 epan/dissectors/packet-zbee-zcl-general.c |1 +
 epan/dissectors/packet-zbee-zcl-hvac.c|4 
 2 files changed, 5 insertions(+)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master 177b631: ieee80211: Add Overlapping BSS Scan (OBSS) IE Parameters (74)

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=177b63125be8ee69adfedc6a0dc56b20804f8c92
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

177b631 by Alexis La Goutte (alexis.lagou...@gmail.com):

ieee80211: Add Overlapping BSS Scan (OBSS) IE Parameters (74)

Change-Id: I0a4ba886d8968e40fb1050d51df22670da350ced
Reviewed-on: https://code.wireshark.org/review/13723
Reviewed-by: Alexis La Goutte 
Petri-Dish: Alexis La Goutte 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  559cbb1   ECMP: fix Unused value (UNUSED_VALUE) found by Coverity 
(CID 1348061)
adds  177b631   ieee80211: Add Overlapping BSS Scan (OBSS) IE Parameters 
(74)


Summary of changes:
 epan/dissectors/packet-ieee80211.c |   79 
 1 file changed, 79 insertions(+)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master 559cbb1: ECMP: fix Unused value (UNUSED_VALUE) found by Coverity (CID 1348061)

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=559cbb16c881ec840a16490a86ebda1e83601eb1
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

559cbb1 by Alexis La Goutte (alexis.lagou...@gmail.com):

ECMP: fix Unused value (UNUSED_VALUE) found by Coverity (CID 1348061)

Change-Id: Ibd5fa458b25e2a8940d036c6a98b61c5d5a4a331
Reviewed-on: https://code.wireshark.org/review/13818
Petri-Dish: Alexis La Goutte 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  ce6ac9e   And we need to check Nsts as well.
adds  559cbb1   ECMP: fix Unused value (UNUSED_VALUE) found by Coverity 
(CID 1348061)


Summary of changes:
 epan/dissectors/packet-ecmp.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master-2.0 ba35b9c: Lua: Check out-of-bounds before tvb_strsize()

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ba35b9c1ed70d737a7288bb49d79342de6492441
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master-2.0
Repository: wireshark

Commits:

ba35b9c by Stig Bjørlykke (s...@bjorlykke.org):

Lua: Check out-of-bounds before tvb_strsize()

Add a check for out-of-bounds before calling tvb_strsize() because
this will THROW an exception if not finding a terminating NUL.

Unhandled exceptions will mess up Lua luaL_error() handling and
will end up in a crash.

Change-Id: Ieafef59a3858656e0d8c79904828b631657b4cbc
Reviewed-on: https://code.wireshark.org/review/13842
Petri-Dish: Stig Bjørlykke 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 
(cherry picked from commit 093514eb49a7b2780f49cccae905c7d963301180)
Reviewed-on: https://code.wireshark.org/review/13845


Actions performed:

from  38a01c8   llrp: limit recursion depth
adds  ba35b9c   Lua: Check out-of-bounds before tvb_strsize()


Summary of changes:
 epan/wslua/wslua_tree.c |   17 +
 1 file changed, 13 insertions(+), 4 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master 093514e: Lua: Check out-of-bounds before tvb_strsize()

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=093514eb49a7b2780f49cccae905c7d963301180
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

093514e by Stig Bjørlykke (s...@bjorlykke.org):

Lua: Check out-of-bounds before tvb_strsize()

Add a check for out-of-bounds before calling tvb_strsize() because
this will THROW an exception if not finding a terminating NUL.

Unhandled exceptions will mess up Lua luaL_error() handling and
will end up in a crash.

Change-Id: Ieafef59a3858656e0d8c79904828b631657b4cbc
Reviewed-on: https://code.wireshark.org/review/13842
Petri-Dish: Stig Bjørlykke 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  54521d3   Update .mailmap
adds  093514e   Lua: Check out-of-bounds before tvb_strsize()


Summary of changes:
 epan/wslua/wslua_tree.c |   17 +
 1 file changed, 13 insertions(+), 4 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master-1.12 e2d01dd: mpeg-audio: do not put bitrate and sampling rate in source and destination columns

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e2d01dd55acca4f56776e727f58ff4bfcd73d29f
Submitter: Pascal Quantin (pascal.quan...@gmail.com)
Changed: branch: master-1.12
Repository: wireshark

Commits:

e2d01dd by Pascal Quantin (pascal.quan...@gmail.com):

mpeg-audio: do not put bitrate and sampling rate in source and destination 
columns

Instead append them to info column.

Bug: 12099
Change-Id: I5451530af2f6cbef519ed541562bffae73e2b1f1
Reviewed-on: https://code.wireshark.org/review/13841
Reviewed-by: Pascal Quantin 
Petri-Dish: Pascal Quantin 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 
(cherry picked from commit 6ba585c070c21899ca960fe99282162b5c5bf332)
Reviewed-on: https://code.wireshark.org/review/13847


Actions performed:

from  74085a5   llrp: limit recursion depth
adds  e2d01dd   mpeg-audio: do not put bitrate and sampling rate in source 
and destination columns


Summary of changes:
 asn1/mpeg-audio/packet-mpeg-audio-template.c |   10 --
 epan/dissectors/packet-mpeg-audio.c  |   14 ++
 2 files changed, 10 insertions(+), 14 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master ce6ac9e: And we need to check Nsts as well.

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ce6ac9e822c8ef716287f79fd3694c6ae7ca84a0
Submitter: Guy Harris (g...@alum.mit.edu)
Changed: branch: master
Repository: wireshark

Commits:

ce6ac9e by Guy Harris (g...@alum.mit.edu):

And we need to check Nsts as well.

The check against 0 isn't really necessary, as stbc_streams >= 0 and
ieee80211_ht_streams[info_n->mcs_index] >= 1, but, what the heck.

Make stbc_streams unsigned, as the value assigned to it is unsigned.

Bug: 12085
Change-Id: I98e0edb718f62ee07bbe56b9d15859c68b7d2e43
Reviewed-on: https://code.wireshark.org/review/13844
Reviewed-by: Guy Harris 


Actions performed:

from  0af5ef3   QCP: Fix retina label calculations.
adds  ce6ac9e   And we need to check Nsts as well.


Summary of changes:
 epan/dissectors/packet-ieee80211-radio.c |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master 6ba585c: mpeg-audio: do not put bitrate and sampling rate in source and destination columns

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6ba585c070c21899ca960fe99282162b5c5bf332
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

6ba585c by Pascal Quantin (pascal.quan...@gmail.com):

mpeg-audio: do not put bitrate and sampling rate in source and destination 
columns

Instead append them to info column.

Bug: 12099
Change-Id: I5451530af2f6cbef519ed541562bffae73e2b1f1
Reviewed-on: https://code.wireshark.org/review/13841
Reviewed-by: Pascal Quantin 
Petri-Dish: Pascal Quantin 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  177b631   ieee80211: Add Overlapping BSS Scan (OBSS) IE Parameters 
(74)
adds  6ba585c   mpeg-audio: do not put bitrate and sampling rate in source 
and destination columns


Summary of changes:
 asn1/mpeg-audio/packet-mpeg-audio-template.c |   10 --
 epan/dissectors/packet-mpeg-audio.c  |   14 ++
 2 files changed, 10 insertions(+), 14 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master-2.0 38a01c8: llrp: limit recursion depth

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=38a01c8b4ec890703a5798e2b31263b9db33b46b
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master-2.0
Repository: wireshark

Commits:

38a01c8 by Evan Huus (eapa...@gmail.com):

llrp: limit recursion depth

LLRP defines fairly complex parameter nesting which we handle via recursion,
however this means a large crafted packet could cause very deep stacks and
potentially stack overflows. Limit our recursive depth to an arbitrary, 
which
should be more than enough for any legitimate packet (I hope).

Bug: 12048
Change-Id: I9ac31bddfa4ffd1a79809387d10d2261749b95e7
Reviewed-on: https://code.wireshark.org/review/13795
Reviewed-by: Anders Broman 


Actions performed:

from  c17d978   QCP: Fix retina label calculations.
adds  38a01c8   llrp: limit recursion depth


Summary of changes:
 epan/dissectors/packet-llrp.c |   67 +
 1 file changed, 35 insertions(+), 32 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master-1.12 74085a5: llrp: limit recursion depth

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=74085a5911b2c9d3120f0a978698455cd191636a
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master-1.12
Repository: wireshark

Commits:

74085a5 by Evan Huus (eapa...@gmail.com):

llrp: limit recursion depth

LLRP defines fairly complex parameter nesting which we handle via recursion,
however this means a large crafted packet could cause very deep stacks and
potentially stack overflows. Limit our recursive depth to an arbitrary, 
which
should be more than enough for any legitimate packet (I hope).

Bug: 12048
Change-Id: I9ac31bddfa4ffd1a79809387d10d2261749b95e7
Reviewed-on: https://code.wireshark.org/review/13796
Reviewed-by: Anders Broman 


Actions performed:

from  53c435a   Prep for 1.12.10.
adds  74085a5   llrp: limit recursion depth


Summary of changes:
 epan/dissectors/packet-llrp.c |   67 +
 1 file changed, 35 insertions(+), 32 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master-2.0 8fc384c: mpeg-audio: do not put bitrate and sampling rate in source and destination columns

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8fc384c2bac679ee9885058295a4529cafe350fc
Submitter: Pascal Quantin (pascal.quan...@gmail.com)
Changed: branch: master-2.0
Repository: wireshark

Commits:

8fc384c by Pascal Quantin (pascal.quan...@gmail.com):

mpeg-audio: do not put bitrate and sampling rate in source and destination 
columns

Instead append them to info column.

Bug: 12099
Change-Id: I5451530af2f6cbef519ed541562bffae73e2b1f1
Reviewed-on: https://code.wireshark.org/review/13841
Reviewed-by: Pascal Quantin 
Petri-Dish: Pascal Quantin 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 
(cherry picked from commit 6ba585c070c21899ca960fe99282162b5c5bf332)
Reviewed-on: https://code.wireshark.org/review/13846


Actions performed:

from  ba35b9c   Lua: Check out-of-bounds before tvb_strsize()
adds  8fc384c   mpeg-audio: do not put bitrate and sampling rate in source 
and destination columns


Summary of changes:
 asn1/mpeg-audio/packet-mpeg-audio-template.c |   10 --
 epan/dissectors/packet-mpeg-audio.c  |   14 ++
 2 files changed, 10 insertions(+), 14 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master f3c0287: ceph: Fix more enum overflow warnings [-Wpedantic]

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f3c028797c7a1928b092f20da60925d493ca949c
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

f3c0287 by João Valverde (joao.valve...@tecnico.ulisboa.pt):

ceph: Fix more enum overflow warnings [-Wpedantic]

Change enum constants to a macro definition instead (even though not
all of them generate overflow warnings).

Change-Id: I276306055d5676b66020976d25665dc1dd7530ec
Reviewed-on: https://code.wireshark.org/review/13815
Petri-Dish: João Valverde 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  372fb96   ceph: Declare convenience types as gint 
[-Wbad-function-cast]
adds  f3c0287   ceph: Fix more enum overflow warnings [-Wpedantic]


Summary of changes:
 epan/dissectors/packet-ceph.c |  121 -
 1 file changed, 48 insertions(+), 73 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master 54521d3: Update .mailmap

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=54521d367c226611217562d4e16d3e46802796da
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

54521d3 by Alexis La Goutte (alexis.lagou...@gmail.com):

Update .mailmap

Change-Id: I38075e12d4da69d5102e5da671e2a166d3b66899
Reviewed-on: https://code.wireshark.org/review/12197
Reviewed-by: Anders Broman 


Actions performed:

from  f3c0287   ceph: Fix more enum overflow warnings [-Wpedantic]
adds  54521d3   Update .mailmap


Summary of changes:
 .mailmap |   19 +--
 1 file changed, 17 insertions(+), 2 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] buildbot failure in Wireshark (development) on Windows 8.1 x86

2016-02-08 Thread buildbot-no-reply 
The Buildbot has detected a new failure on builder Windows 8.1 x86 while 
building wireshark. Full details are available at:

http://buildbot.wireshark.org/wireshark-master/builders/Windows%208.1%20x86/builds/5597

Buildbot URL: http://buildbot.wireshark.org/wireshark-master/

Buildslave for this Build: windows-8.1-x86

Build Reason: The SingleBranchScheduler scheduler named 'Gerrit' triggered this 
build
Build Source Stamp: [branch master] 54521d367c226611217562d4e16d3e46802796da
Blamelist: Anders Broman 

BUILD FAILED: failed compile_6

Sincerely,
 -The Buildbot



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

[Wireshark-commits] master 372fb96: ceph: Declare convenience types as gint [-Wbad-function-cast]

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=372fb966ae19619eecaf5020a373aa280b0c21b9
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

372fb96 by João Valverde (joao.valve...@tecnico.ulisboa.pt):

ceph: Declare convenience types as gint [-Wbad-function-cast]

Avoid casting integer to enum.

Change-Id: I704e64b3d27fb0f77059706629a47d4adb74e5ad
Reviewed-on: https://code.wireshark.org/review/13814
Petri-Dish: João Valverde 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  6ba585c   mpeg-audio: do not put bitrate and sampling rate in source 
and destination columns
adds  372fb96   ceph: Declare convenience types as gint 
[-Wbad-function-cast]


Summary of changes:
 epan/dissectors/packet-ceph.c |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master 23c6241: sshdump: fix default value for capture filter.

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=23c6241e52818586d63583830bf18dfa08edc1fc
Submitter: Roland Knall (rkn...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

23c6241 by Dario Lombardo (lom...@gmail.com):

sshdump: fix default value for capture filter.

Change-Id: I21c4d6fa6726165882ed104262b1e2b22557d8cd
Reviewed-on: https://code.wireshark.org/review/13522
Reviewed-by: Roland Knall 


Actions performed:

from  db3795b   Add missing breaks (CID 1348047 .. 1348051)
adds  23c6241   sshdump: fix default value for capture filter.


Summary of changes:
 extcap/sshdump.c |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master 22a569a: tools: improve valgrind script.

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=22a569ad3acd0833e593c02813edd8fe2eb73b3e
Submitter: Evan Huus (eapa...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

22a569a by Dario Lombardo (lom...@gmail.com):

tools: improve valgrind script.

Change-Id: Ifae62e6334b48002516dfff6d1c2f094445f423c
Reviewed-on: https://code.wireshark.org/review/13820
Reviewed-by: Evan Huus 


Actions performed:

from  23c6241   sshdump: fix default value for capture filter.
adds  22a569a   tools: improve valgrind script.


Summary of changes:
 tools/valgrind-wireshark.sh |   16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master-2.0 8f676eb: Qt: Restore sequence diagram labels, other fixes.

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8f676eb999d69539054281724b572e244cbebd66
Submitter: Gerald Combs (ger...@wireshark.org)
Changed: branch: master-2.0
Repository: wireshark

Commits:

8f676eb by Gerald Combs (ger...@wireshark.org):

Qt: Restore sequence diagram labels, other fixes.

SequenceDiagram implements time, address, and comment labels using
QCPAxis::setTickVector and QCPAxis::setTickVectorLabels. It also calls
QCPAxis::setTicks(false) so that we don't draw tick marks. It appears
that doing so also disables the labels themselves in our current version
of QCP. Set the tick pen to Qt::NoPen instead.

Only draw node lines where we have nodes.

Add notes about a retina issue and the need for zooming.

Bug: 11710
Change-Id: I88c30a1ddcd29832f86b1ca8c018c7fa6b6d64a7
Reviewed-on: https://code.wireshark.org/review/13781
Petri-Dish: Gerald Combs 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Gerald Combs 
(cherry picked from commit 477769b82370102228056364bef31f2ac74c38b3)
Reviewed-on: https://code.wireshark.org/review/13828


Actions performed:

from  f4384e6   Lua: Remove WSLUA_ERROR on dissecting error
adds  8f676eb   Qt: Restore sequence diagram labels, other fixes.


Summary of changes:
 ui/qt/sequence_diagram.cpp |   10 --
 ui/qt/sequence_dialog.cpp  |2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master-2.0 f4384e6: Lua: Remove WSLUA_ERROR on dissecting error

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f4384e6cda716ad7eaf9174c29319ddc25c366f4
Submitter: Stig Bj?rlykke (s...@bjorlykke.org)
Changed: branch: master-2.0
Repository: wireshark

Commits:

f4384e6 by Stig Bjørlykke (s...@bjorlykke.org):

Lua: Remove WSLUA_ERROR on dissecting error

On error in Dissector_call and DissectorTable_try we should not
terminate with WSLUA_ERROR because the error is already reported
in the tree with show_exception().

Change-Id: I60739f12cb8b16fe2270f47701286fd0dbf04c6f
Reviewed-on: https://code.wireshark.org/review/13819
Petri-Dish: Stig Bjørlykke 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Stig Bjørlykke 
(cherry picked from commit 0f2a0e83fbb701a0836da36c16c162817d4a9b2f)
Reviewed-on: https://code.wireshark.org/review/13826


Actions performed:

from  0de8c2e   MAX_MCS_INDEX is a valid array index.
adds  f4384e6   Lua: Remove WSLUA_ERROR on dissecting error


Summary of changes:
 epan/wslua/wslua_dissector.c |8 
 1 file changed, 8 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master 477769b: Qt: Restore sequence diagram labels, other fixes.

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=477769b82370102228056364bef31f2ac74c38b3
Submitter: Gerald Combs (ger...@wireshark.org)
Changed: branch: master
Repository: wireshark

Commits:

477769b by Gerald Combs (ger...@wireshark.org):

Qt: Restore sequence diagram labels, other fixes.

SequenceDiagram implements time, address, and comment labels using
QCPAxis::setTickVector and QCPAxis::setTickVectorLabels. It also calls
QCPAxis::setTicks(false) so that we don't draw tick marks. It appears
that doing so also disables the labels themselves in our current version
of QCP. Set the tick pen to Qt::NoPen instead.

Only draw node lines where we have nodes.

Add notes about a retina issue and the need for zooming.

Bug: 11710
Change-Id: I88c30a1ddcd29832f86b1ca8c018c7fa6b6d64a7
Reviewed-on: https://code.wireshark.org/review/13781
Petri-Dish: Gerald Combs 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Gerald Combs 


Actions performed:

from  ddc8a49   Regenerate RTSE dissector.
adds  477769b   Qt: Restore sequence diagram labels, other fixes.


Summary of changes:
 ui/qt/sequence_diagram.cpp |   10 --
 ui/qt/sequence_dialog.cpp  |2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master-2.0 e3690bf: GSM SMS: fix dissection of alphanumeric address

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e3690bfc794e97fefeaa6edb3f99fc75f804ad93
Submitter: Pascal Quantin (pascal.quan...@gmail.com)
Changed: branch: master-2.0
Repository: wireshark

Commits:

e3690bf by Pascal Quantin (pascal.quan...@gmail.com):

GSM SMS: fix dissection of alphanumeric address

Change-Id: I5d6f3c78b99979376243f722161b3ae25adad230
Reviewed-on: https://code.wireshark.org/review/13830
Reviewed-by: Pascal Quantin 
(cherry picked from commit 2e6d7805ede6a3a3a7078422345e7cf743e3486e)
Reviewed-on: https://code.wireshark.org/review/13831


Actions performed:

from  8f676eb   Qt: Restore sequence diagram labels, other fixes.
adds  e3690bf   GSM SMS: fix dissection of alphanumeric address


Summary of changes:
 epan/dissectors/packet-gsm_sms.c |8 
 1 file changed, 4 insertions(+), 4 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master 2e6d780: GSM SMS: fix dissection of alphanumeric address

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2e6d7805ede6a3a3a7078422345e7cf743e3486e
Submitter: Pascal Quantin (pascal.quan...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

2e6d780 by Pascal Quantin (pascal.quan...@gmail.com):

GSM SMS: fix dissection of alphanumeric address

Change-Id: I5d6f3c78b99979376243f722161b3ae25adad230
Reviewed-on: https://code.wireshark.org/review/13830
Reviewed-by: Pascal Quantin 


Actions performed:

from  477769b   Qt: Restore sequence diagram labels, other fixes.
adds  2e6d780   GSM SMS: fix dissection of alphanumeric address


Summary of changes:
 epan/dissectors/packet-gsm_sms.c |8 
 1 file changed, 4 insertions(+), 4 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master-1.12 d614a07: GSM SMS: fix dissection of alphanumeric address

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d614a073956c12ad88ba1c13b25dfdb23edcf85e
Submitter: Pascal Quantin (pascal.quan...@gmail.com)
Changed: branch: master-1.12
Repository: wireshark

Commits:

d614a07 by Pascal Quantin (pascal.quan...@gmail.com):

GSM SMS: fix dissection of alphanumeric address

Change-Id: I5d6f3c78b99979376243f722161b3ae25adad230
Reviewed-on: https://code.wireshark.org/review/13830
Reviewed-by: Pascal Quantin 
(cherry picked from commit 2e6d7805ede6a3a3a7078422345e7cf743e3486e)
Conflicts:
epan/dissectors/packet-gsm_sms.c
Reviewed-on: https://code.wireshark.org/review/13832


Actions performed:

from  0e6b32c   [Automatic update for 2016-02-07]
adds  d614a07   GSM SMS: fix dissection of alphanumeric address


Summary of changes:
 epan/dissectors/packet-gsm_sms.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master 0ae6a19: Revert "Lua: Remove WSLUA_ERROR on dissecting error"

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0ae6a19f7dbd560c6f6a06a6470472eea0c24fda
Submitter: Stig Bj?rlykke (s...@bjorlykke.org)
Changed: branch: master
Repository: wireshark

Commits:

0ae6a19 by Stig Bjørlykke (s...@bjorlykke.org):

Revert "Lua: Remove WSLUA_ERROR on dissecting error"

This reverts commit 0f2a0e83fbb701a0836da36c16c162817d4a9b2f.

Change-Id: Ifc40f99385a5948a033bb611b4ce8a0fa615b333
Reviewed-on: https://code.wireshark.org/review/13837
Reviewed-by: Stig Bjørlykke 


Actions performed:

from  2e6d780   GSM SMS: fix dissection of alphanumeric address
adds  0ae6a19   Revert "Lua: Remove WSLUA_ERROR on dissecting error"


Summary of changes:
 epan/wslua/wslua_dissector.c |8 
 1 file changed, 8 insertions(+)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master-1.12 53c435a: Prep for 1.12.10.

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=53c435a1c8ee7afac8bb90b1915aa87fa277159f
Submitter: Gerald Combs (ger...@wireshark.org)
Changed: branch: master-1.12
Repository: wireshark

Commits:

53c435a by Gerald Combs (ger...@wireshark.org):

Prep for 1.12.10.

Change-Id: I4d0854d2a9cb688495e8a51ac26624bb6117177a
Reviewed-on: https://code.wireshark.org/review/13840
Reviewed-by: Gerald Combs 


Actions performed:

from  d614a07   GSM SMS: fix dissection of alphanumeric address
adds  53c435a   Prep for 1.12.10.


Summary of changes:
 docbook/release-notes.asciidoc |   42 +++-
 1 file changed, 37 insertions(+), 5 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master-2.0 839139a: Revert "Lua: Remove WSLUA_ERROR on dissecting error"

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=839139a3ac1d1cdf876cffb398841c51a5cfabc6
Submitter: Stig Bj?rlykke (s...@bjorlykke.org)
Changed: branch: master-2.0
Repository: wireshark

Commits:

839139a by Stig Bjørlykke (s...@bjorlykke.org):

Revert "Lua: Remove WSLUA_ERROR on dissecting error"

This reverts commit f4384e6cda716ad7eaf9174c29319ddc25c366f4.

Change-Id: Ic92348cbdcd1623351ec5916623de64f27e30a53
Reviewed-on: https://code.wireshark.org/review/13836
Reviewed-by: Stig Bjørlykke 


Actions performed:

from  e3690bf   GSM SMS: fix dissection of alphanumeric address
adds  839139a   Revert "Lua: Remove WSLUA_ERROR on dissecting error"


Summary of changes:
 epan/wslua/wslua_dissector.c |8 
 1 file changed, 8 insertions(+)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master-2.0 df9de2f: Prep for 2.0.2.

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=df9de2f762d18b126323bc914ab7d531b03d633b
Submitter: Gerald Combs (ger...@wireshark.org)
Changed: branch: master-2.0
Repository: wireshark

Commits:

df9de2f by Gerald Combs (ger...@wireshark.org):

Prep for 2.0.2.

Change-Id: Ief4ec0ec3224cecff9939c7af97e33247e7e8f07
Reviewed-on: https://code.wireshark.org/review/13839
Reviewed-by: Gerald Combs 


Actions performed:

from  839139a   Revert "Lua: Remove WSLUA_ERROR on dissecting error"
adds  df9de2f   Prep for 2.0.2.


Summary of changes:
 docbook/release-notes.asciidoc |  181 ++--
 1 file changed, 176 insertions(+), 5 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master 0af5ef3: QCP: Fix retina label calculations.

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0af5ef3fce9f6eb72d4d45b4424a4f219f7cb976
Submitter: Gerald Combs (ger...@wireshark.org)
Changed: branch: master
Repository: wireshark

Commits:

0af5ef3 by Gerald Combs (ger...@wireshark.org):

QCP: Fix retina label calculations.

The retina fixes in gb10bad1 and gb3f3d66 were incomplete and caused
rendering problems in our axis labels. Handle the device pixel ratio in
a couple of more places so that our axis rects are correctly sized.

Add a switch (WS_ENABLE_DP_RATIO) to make it easy to turn scaling on and
off.

Change-Id: I633d94d633e0743be2a607c9a4cbb3409e9eed62
Ping-Bug: 11710
Reviewed-on: https://code.wireshark.org/review/13834
Petri-Dish: Gerald Combs 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Gerald Combs 


Actions performed:

from  0ae6a19   Revert "Lua: Remove WSLUA_ERROR on dissecting error"
adds  0af5ef3   QCP: Fix retina label calculations.


Summary of changes:
 ui/qt/qcustomplot.cpp |   24 
 1 file changed, 16 insertions(+), 8 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master-2.0 c17d978: QCP: Fix retina label calculations.

2016-02-08 Thread Wireshark code review 
URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c17d97829615885470ca09e373b495cab5b0a170
Submitter: Gerald Combs (ger...@wireshark.org)
Changed: branch: master-2.0
Repository: wireshark

Commits:

c17d978 by Gerald Combs (ger...@wireshark.org):

QCP: Fix retina label calculations.

The retina fixes in gb10bad1 and gb3f3d66 were incomplete and caused
rendering problems in our axis labels. Handle the device pixel ratio in
a couple of more places so that our axis rects are correctly sized.

Add a switch (WS_ENABLE_DP_RATIO) to make it easy to turn scaling on and
off.

Change-Id: I633d94d633e0743be2a607c9a4cbb3409e9eed62
Ping-Bug: 11710
Reviewed-on: https://code.wireshark.org/review/13834
Petri-Dish: Gerald Combs 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Gerald Combs 
(cherry picked from commit 0af5ef3fce9f6eb72d4d45b4424a4f219f7cb976)
Reviewed-on: https://code.wireshark.org/review/13843


Actions performed:

from  df9de2f   Prep for 2.0.2.
adds  c17d978   QCP: Fix retina label calculations.


Summary of changes:
 ui/qt/qcustomplot.cpp |   24 
 1 file changed, 16 insertions(+), 8 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe