[Wireshark-commits] [wireshark] reference refs/changes/13664 created (now cb443e5)

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cb443e5302aaa7d5382fb2b1159af4b9e86be596
Submitter: cedric izoard (cedric.izo...@ceva-dsp.com)
Changed: reference: refs/changes/13664
Repository: wireshark

Commits:

[ log message not found ]


Actions performed:

  at  cb443e5   [airpdcap] Add support to decrypt TDLS traffic

___
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 eeafb47: Fix Qt4 moc option argument and add build parametrization

[Wireshark code review]

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

Commits:

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

Fix Qt4 moc option argument and add build parametrization

Change-Id: Ib758f0eabaf96f9c6010201e7e16147fcfa0daa2
Reviewed-on: https://code.wireshark.org/review/13671
Petri-Dish: João Valverde 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Michal Labedzki 
Tested-by: Michal Labedzki 
Reviewed-by: Alexis La Goutte 


Actions performed:

from  6402092   Adds calculation of preamble length and frame duration.
adds  eeafb47   Fix Qt4 moc option argument and add build parametrization


Summary of changes:
 CMakeLists.txt   |8 
 acinclude.m4 |5 -
 configure.ac |   17 -
 ui/qt/CMakeLists.txt |4 ++--
 ui/qt/Makefile.am|2 +-
 5 files changed, 31 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 2e84d20: GTP session tracker removing frame info fix

[Wireshark code review]

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

Commits:

2e84d20 by Gloria Pozuelo (gloria.pozu...@bics.com):

GTP session tracker removing frame info fix

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


Actions performed:

from  eeafb47   Fix Qt4 moc option argument and add build parametrization
adds  2e84d20   GTP session tracker removing frame info fix


Summary of changes:
 epan/dissectors/packet-gtp.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 0538470: Suite test: fix modelines for bash script (emac)

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=05384709a0a208f298e25c0123aa8e2adead583f
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

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

Suite test: fix modelines for bash script (emac)

c-basic-offset -> sh-basic-offset

Change-Id: I16b19b608fbdb7f0408f7c31871fae746c8c4f50
Reviewed-on: https://code.wireshark.org/review/13683
Reviewed-by: cedric izoard 
Reviewed-by: Anders Broman 


Actions performed:

from  2e84d20   GTP session tracker removing frame info fix
adds  0538470   Suite test: fix modelines for bash script (emac)


Summary of changes:
 test/suite-capture.sh |2 +-
 test/suite-clopts.sh  |2 +-
 test/suite-decryption.sh  |2 +-
 test/suite-fileformats.sh |2 +-
 test/suite-io.sh  |2 +-
 test/suite-mergecap.sh|2 +-
 test/suite-nameres.sh |2 +-
 test/suite-text2pcap.sh   |2 +-
 test/suite-unittests.sh   |2 +-
 test/suite-wslua.sh   |2 +-
 10 files changed, 10 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 0ce188a: HTTP2: fix 'http2' exists multiple times with NOT compatible types: FT_NONE and FT_PROTOCOL

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0ce188a9ebc0ef045eafaec63067d1a565b64e34
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

0ce188a by Alexis La Goutte (alexis.lagou...@gmail.com):

HTTP2: fix 'http2' exists multiple times with NOT compatible types: FT_NONE 
and FT_PROTOCOL

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


Actions performed:

from  91613a0   pcapng (dissector): fix 'pcapng.options.option.data.ipv4' 
exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
adds  0ce188a   HTTP2: fix 'http2' exists multiple times with NOT 
compatible types: FT_NONE and FT_PROTOCOL


Summary of changes:
 epan/dissectors/packet-http2.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] [wireshark] reference refs/changes/13664 created (now 231d89f)

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=231d89f142ec9b0f329ea3fcb11b2b571723d6fa
Submitter: cedric izoard (cedric.izo...@ceva-dsp.com)
Changed: reference: refs/changes/13664
Repository: wireshark

Commits:

[ log message not found ]


Actions performed:

  at  231d89f   [airpdcap] Add support to decrypt TDLS traffic

___
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 a57c3bc: suite-decrypt: fix mixed indent (use tabs)

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a57c3bcc87671c7df60b5f282b87243fcf824cfa
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

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

suite-decrypt: fix mixed indent (use tabs)

Change-Id: I80f2afb6e0cc44af6466fa255e91a40b29c4ca13
Reviewed-on: https://code.wireshark.org/review/13685
Reviewed-by: cedric izoard 
Reviewed-by: Anders Broman 


Actions performed:

from  a47c850   suite-mergecap: fix indent (use tabs)
adds  a57c3bc   suite-decrypt: fix mixed indent (use tabs)


Summary of changes:
 test/suite-decryption.sh |   98 +++---
 1 file changed, 49 insertions(+), 49 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 e9fc9c4: MS NLB: fix msnlb.reserved' exists multiple times with NOT compatible types: FT_NONE and FT_BYTES

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e9fc9c4506207ff4287359b6e9215afb13ca8269
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

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

MS NLB: fix msnlb.reserved' exists multiple times with NOT compatible 
types: FT_NONE and FT_BYTES

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


Actions performed:

from  a57c3bc   suite-decrypt: fix mixed indent (use tabs)
adds  e9fc9c4   MS NLB: fix msnlb.reserved' exists multiple times with NOT 
compatible types: FT_NONE and FT_BYTES


Summary of changes:
 epan/dissectors/packet-msnlb.c |4 ++--
 1 file changed, 2 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 91613a0: pcapng (dissector): fix 'pcapng.options.option.data.ipv4' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=91613a04db4d6381df06b582b4375609f6613f0c
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

91613a0 by Alexis La Goutte (alexis.lagou...@gmail.com):

pcapng (dissector): fix 'pcapng.options.option.data.ipv4' exists multiple 
times with NOT compatible types: FT_IPv6 and FT_IPv4

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


Actions performed:

from  d8e2768   CAPWAP: fix 'capwap.control.fortinet.ebptag.ebp' exists 
multiple times with NOT compatible types: FT_ETHER and FT_UINT8
adds  91613a0   pcapng (dissector): fix 'pcapng.options.option.data.ipv4' 
exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4


Summary of changes:
 epan/dissectors/file-pcapng.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] buildbot failure in Wireshark (development) on Windows 7 x64

[buildbot-no-reply]

The Buildbot has detected a new failure on builder Windows 7 x64 while building 
wireshark. Full details are available at:

http://buildbot.wireshark.org/wireshark-master/builders/Windows%207%20x64/builds/15289

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

Buildslave for this Build: windows-7-x64

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

BUILD FAILED: failed

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 ee86421: Squelch warnings from compilers that don't know that (a%b) is always < b.

[Wireshark code review]

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

Commits:

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

Squelch warnings from compilers that don't know that (a%b) is always < b.

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


Actions performed:

from  2079e5d   Get rid of an unused variable.
adds  ee86421   Squelch warnings from compilers that don't know that (a%b) 
is always < b.


Summary of changes:
 wsutil/sha2.c |4 ++--
 1 file changed, 2 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 OSX 10.6 x64

[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/10128

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] c3c93869fc736e36649f1cd6e33f00b49cb3122f
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 c3c9386: extcap: do not leak "version" field

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c3c93869fc736e36649f1cd6e33f00b49cb3122f
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

c3c9386 by Peter Wu (pe...@lekensteyn.nl):

extcap: do not leak "version" field

Caught by LeakSanitizer:

Direct leak of 18 byte(s) in 3 object(s) allocated from:
#0 0x55ec8c5ffec8 in __interceptor_malloc (run/wireshark+0x145dec8)
#1 0x7f4d021e4328 in g_malloc /build/src/glib-2.46.2/glib/gmem.c:94
#2 0x7f4d021fd0de in g_strdup 
/build/src/glib-2.46.2/glib/gstrfuncs.c:363
#3 0x55ec8c6ce514 in extcap_parse_interface_sentence 
extcap_parser.c:670:26
#4 0x55ec8c6ce7ad in extcap_parse_interfaces extcap_parser.c:683:13
#5 0x55ec8c6b6781 in interfaces_cb extcap.c:313:5
#6 0x55ec8c6b4ce6 in extcap_foreach extcap.c:206:26
#7 0x55ec8c6b62a6 in extcap_interface_list extcap.c:415:5
#8 0x55ec8c6b7fab in extcap_register_preferences extcap.c:437:9
#9 0x55ec8c63104a in main wireshark-qt.cpp:847:5
#10 0x7f4ce8f4460f in __libc_start_main (/usr/lib/libc.so.6+0x2060f)
#11 0x55ec8c569ed8 in _start (run/wireshark+0x13c7ed8)

Change-Id: I0ef89e647b2cc9aab495a80f6c638e9b67cf3ad1
Reviewed-on: https://code.wireshark.org/review/13692
Reviewed-by: Dario Lombardo 
Petri-Dish: Dario Lombardo 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  7f3f11f   Add Userlog dissector
adds  c3c9386   extcap: do not leak "version" field


Summary of changes:
 extcap_parser.c |9 +++--
 1 file changed, 3 insertions(+), 6 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 16bee21: Add functions for SHA256 and HMAC-SHA256

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=16bee215c1e65cf5f7f22b35738414c45b912aba
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

16bee21 by Cedric Izoard (cedric.izo...@ceva-dsp.com):

Add functions for SHA256 and HMAC-SHA256

- Use same API as SHA-1
- Tested against NIST's test vectors (byte oriented implementation)

Bug: 11312
Change-Id: I7fea7d13c43da059138153b17de7084ef9d81ac5
Reviewed-on: https://code.wireshark.org/review/13662
Petri-Dish: Alexis La Goutte 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  1b1b934   M3AP: fix dissection of IPAddress field
adds  16bee21   Add functions for SHA256 and HMAC-SHA256


Summary of changes:
 wsutil/CMakeLists.txt  |1 +
 wsutil/Makefile.common |2 +
 wsutil/sha2.c  |  281 
 wsutil/sha2.h  |   75 +
 4 files changed, 359 insertions(+)
 create mode 100644 wsutil/sha2.c
 create mode 100644 wsutil/sha2.h
___
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 7f3f11f: Add Userlog dissector

[Wireshark code review]

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

Commits:

7f3f11f by Jun Wang (sdn_...@163.com):

Add Userlog dissector

Userlog is user flow logs of H3C device.
Flow logging records users' access to the extranet. The device classifies 
and
calculates flows through the 5-tuple information, which includes source IP 
address,
destination IP address, source port, destination port, and protocol number,
and generates user flow logs. Flow logging records the 5-tuple information 
of
the packets and number of the bytes received and sent. With flow logs, 
administrators
can track and record accesses to the network, facilitating the availability 
and
security of the network.

examplecapture: https://wiki.wireshark.org/SampleCaptures#UserLog

Bug: 11878
Change-Id: If3b5ca75bdd6cd8dc12af4a35401c5a6aa193a73
Reviewed-on: https://code.wireshark.org/review/8148
Reviewed-by: Michael Mann 
Petri-Dish: Michael Mann 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  393b183   Add AES-CMAC encryption support
adds  7f3f11f   Add Userlog dissector


Summary of changes:
 docbook/release-notes.asciidoc   |1 +
 epan/CMakeLists.txt  |1 +
 epan/dissectors/Makefile.common  |1 +
 epan/dissectors/packet-userlog.c |  432 ++
 4 files changed, 435 insertions(+)
 create mode 100644 epan/dissectors/packet-userlog.c
___
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 2079e5d: Get rid of an unused variable.

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2079e5da30f4111ec9c0f7e6068d7fd25b7cefe3
Submitter: Guy Harris (g...@alum.mit.edu)
Changed: branch: master
Repository: wireshark

Commits:

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

Get rid of an unused variable.

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


Actions performed:

from  c3c9386   extcap: do not leak "version" field
adds  2079e5d   Get rid of an unused variable.


Summary of changes:
 plugins/ethercat/packet-ecatmb.c |5 -
 1 file changed, 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 393b183: Add AES-CMAC encryption support

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=393b1838ad08a1e088f4e11a9adb0681d3ec5fb2
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

393b183 by Cedric Izoard (cedric.izo...@ceva-dsp.com):

Add AES-CMAC encryption support

-Add AES-CMAC encryption need to check MIC when deriving TDLS keys (802.11)
-Tested against NIST test vector for AES128-CMAC

Bug: 11312
Change-Id: Id4fd839bdedd3aa135823334e59d98271aea7c2b
Reviewed-on: https://code.wireshark.org/review/13663
Petri-Dish: Alexis La Goutte 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  16bee21   Add functions for SHA256 and HMAC-SHA256
adds  393b183   Add AES-CMAC encryption support


Summary of changes:
 wsutil/aes.c |   97 ++
 wsutil/aes.h |   41 +
 2 files changed, 138 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 0421e78: Fixed bug when the actual remaining command data is less than the size specified in the EtherCAT mailbox header.

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0421e7898861ba94b2eb353f1936e49565718b90
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

0421e78 by richardk (kuemmel@googlemail.com):

Fixed bug when the actual remaining command data is less than the size
specified in the EtherCAT mailbox header.

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


Actions performed:

from  ff07bd4   No need for execute bit on setuid-root.pl.in
adds  0421e78   Fixed bug when the actual remaining command data is less 
than the size specified in the EtherCAT mailbox header.


Summary of changes:
 plugins/ethercat/packet-ecatmb.c|  111 ++
 plugins/ethercat/packet-ethercat-datagram.c |  135 ---
 2 files changed, 131 insertions(+), 115 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 ff07bd4: No need for execute bit on setuid-root.pl.in

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ff07bd4562b6a4aadce180875bfe9d00d24bf172
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

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

No need for execute bit on setuid-root.pl.in

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


Actions performed:

from  ca13f64   OpenFlow (v1): fix exists multiple times with NOT 
compatible types
adds  ff07bd4   No need for execute bit on setuid-root.pl.in


Summary of changes:
 0 files changed
 mode change 100755 => 100644 tools/setuid-root.pl.in
___
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 ca13f64: OpenFlow (v1): fix exists multiple times with NOT compatible types

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ca13f64162b7c29509eb3e11deed755c82e67d1c
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

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

OpenFlow (v1): fix exists multiple times with NOT compatible types

'openflow.ofp_match.pad' exists multiple times with NOT compatible types: 
FT_UINT16 and FT_BYTES

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


Actions performed:

from  a3f23d9   MPLS : fix exists multiple times with NOT compatible types
adds  ca13f64   OpenFlow (v1): fix exists multiple times with NOT 
compatible types


Summary of changes:
 epan/dissectors/packet-openflow_v1.c |8 +---
 1 file changed, 1 insertion(+), 7 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 ad45802: Sync ASN.1 templates and generated code (spelling fixes)

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ad458027a7f938107510678bebd3b35329d02917
Submitter: Jo?o Valverde (j...@v6e.pt)
Changed: branch: master
Repository: wireshark

Commits:

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

Sync ASN.1 templates and generated code (spelling fixes)

Change-Id: Ib6ed980ecf5d5418349946c8da26f81fe1c02dd1
Reviewed-on: https://code.wireshark.org/review/13701
Reviewed-by: João Valverde 


Actions performed:

from  7935816   LCSAP: Sync ASN.1 template and add missing braces
adds  ad45802   Sync ASN.1 templates and generated code (spelling fixes)


Summary of changes:
 asn1/h450-ros/packet-h450-ros-template.c |2 +-
 asn1/mpeg-pes/packet-mpeg-pes-template.c |2 +-
 asn1/q932-ros/packet-q932-ros-template.c |2 +-
 asn1/snmp/packet-snmp-template.c |6 +++---
 epan/dissectors/packet-snmp.c|2 +-
 5 files changed, 7 insertions(+), 7 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 7935816: LCSAP: Sync ASN.1 template and add missing braces

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7935816b283bdd003ce8338ca594d4cbd151bd94
Submitter: Jo?o Valverde (j...@v6e.pt)
Changed: branch: master
Repository: wireshark

Commits:

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

LCSAP: Sync ASN.1 template and add missing braces

Change-Id: Iaddfa41e71ea28dd935bf777214764381928baa5
Reviewed-on: https://code.wireshark.org/review/13700
Reviewed-by: João Valverde 


Actions performed:

from  ee86421   Squelch warnings from compilers that don't know that (a%b) 
is always < b.
adds  7935816   LCSAP: Sync ASN.1 template and add missing braces


Summary of changes:
 asn1/lcsap/lcsap.cnf   |   19 +--
 epan/dissectors/packet-lcsap.c |   39 ++-
 2 files changed, 27 insertions(+), 31 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 35ef16b: THRIFT: add heuristic for TFramedTransport

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=35ef16bcaf80564991b3acf339bcf65429ab6f6f
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

35ef16b by Jason Heimann (jheim...@pertino.com):

THRIFT: add heuristic for TFramedTransport

Change-Id: Ic55c2232fd2ca4885104810fac24eb3b716e5857
Reviewed-on: https://code.wireshark.org/review/13675
Petri-Dish: Anders Broman 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  5d3d330   make-version: Silence one diagnostic message with a verbose 
option
adds  35ef16b   THRIFT: add heuristic for TFramedTransport


Summary of changes:
 epan/dissectors/packet-thrift.c |   26 --
 1 file changed, 24 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-1.12 1646d1a: OSPF: Wrong interpretation of Instance ID value in OSPFv3 packet

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1646d1aa2f9d5ea5382f22fa63a36e1635b95d8c
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master-1.12
Repository: wireshark

Commits:

1646d1a by Alexis La Goutte (alexis.lagou...@gmail.com):

OSPF: Wrong interpretation of Instance ID value in OSPFv3 packet

Reported by Garri

Bug:12072
Change-Id: I6f35bdcd54f71138e58048086bf291e5be7967dd
Reviewed-on: https://code.wireshark.org/review/13697
Reviewed-by: Jaap Keuter 
Petri-Dish: Jaap Keuter 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 
(cherry picked from commit 2e1c181996ad4029b12fbeec5866d3cdaeb04714)
Reviewed-on: https://code.wireshark.org/review/13702
(cherry picked from commit bb5235eae02ea8c63e4f5844cc8c5acb9b9578e5)
Reviewed-on: https://code.wireshark.org/review/13703


Actions performed:

from  b5bcaf5   [Automatic update for 2016-01-31]
adds  1646d1a   OSPF: Wrong interpretation of Instance ID value in OSPFv3 
packet


Summary of changes:
 epan/dissectors/packet-ospf.c |   10 +-
 1 file changed, 5 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 bb5235e: OSPF: Wrong interpretation of Instance ID value in OSPFv3 packet

[Wireshark code review]

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

Commits:

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

OSPF: Wrong interpretation of Instance ID value in OSPFv3 packet

Reported by Garri

Bug:12072
Change-Id: I6f35bdcd54f71138e58048086bf291e5be7967dd
Reviewed-on: https://code.wireshark.org/review/13697
Reviewed-by: Jaap Keuter 
Petri-Dish: Jaap Keuter 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 
(cherry picked from commit 2e1c181996ad4029b12fbeec5866d3cdaeb04714)
Reviewed-on: https://code.wireshark.org/review/13702


Actions performed:

from  eaa758c   Display Filter Expression dialog updates.
adds  bb5235e   OSPF: Wrong interpretation of Instance ID value in OSPFv3 
packet


Summary of changes:
 epan/dissectors/packet-ospf.c |   10 +-
 1 file changed, 5 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 36cf75e: CIP/ENIP: Enhance Info column display

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=36cf75efb15827c801c4e82c8ab3ed16f3e00749
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

36cf75e by D. Ulis (daul...@gmail.com):

CIP/ENIP: Enhance Info column display

1. ENIP: When there is more than one ENIP command in a given TCP packet, 
display both in the Info column. Previously, only 1 would be displayed.
2. CIP: Services need a context to be able to interpret properly. Display 
the Class or Symbol name in the Info column in an object oriented manner for 
Request Paths, or Connection Paths.
3. CIP: Display the request path/service in a CIP response, instead of just 
"Success". These changes make it visually easier to identify traffic.
4. CIP: For the Info column, make Multiple Service Packet formatting a 
little more consistent regarding the divider between embedded packets. 
Previously, it would display 2 different separator types "," and "|".
5. CIP: Add preference to enable/disable "Display enhanced Info column data"

Change-Id: I7e95bc144588c0925137e01abbc814babb494d19
Reviewed-on: https://code.wireshark.org/review/13632
Petri-Dish: Michael Mann 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  6991149   [airpdcap] Add support to decrypt TDLS traffic
adds  36cf75e   CIP/ENIP: Enhance Info column display


Summary of changes:
 epan/dissectors/packet-cip.c   |  139 +---
 epan/dissectors/packet-cip.h   |   10 ++-
 epan/dissectors/packet-cipsafety.c |4 +-
 epan/dissectors/packet-enip.c  |4 +-
 4 files changed, 111 insertions(+), 46 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 4056712: Fix memleaks related to get_dirname

[Wireshark code review]

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

Commits:

4056712 by Peter Wu (pe...@lekensteyn.nl):

Fix memleaks related to get_dirname

get_dirname may return NULL instead of the original string, so avoid
patterns like get_dirname(strdup(x)). Writing to
cf_path.toUtf8().data() is fine btw, toUtf8() returns new memory.

This fixes two memleak reported by LeakSanitizer via fileset_add_dir and
MainWindow::captureFileReadFinished (both via cf_callback_invoke).

Change-Id: I0f1528763e77e1f55b54b6674c890a9d02302ee8
Reviewed-on: https://code.wireshark.org/review/13691
Petri-Dish: Dario Lombardo 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 
(cherry picked from commit 8899e006aab3e0831214d187596eef450b5e21b7)
Reviewed-on: https://code.wireshark.org/review/13704


Actions performed:

from  bb5235e   OSPF: Wrong interpretation of Instance ID value in OSPFv3 
packet
adds  4056712   Fix memleaks related to get_dirname


Summary of changes:
 fileset.c   |4 ++--
 ui/gtk/main.c   |   12 ++--
 ui/qt/main_window.cpp   |8 
 ui/qt/main_window_slots.cpp |6 +++---
 wireshark-qt.cpp|4 ++--
 5 files changed, 17 insertions(+), 17 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 8899e00: Fix memleaks related to get_dirname

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8899e006aab3e0831214d187596eef450b5e21b7
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

8899e00 by Peter Wu (pe...@lekensteyn.nl):

Fix memleaks related to get_dirname

get_dirname may return NULL instead of the original string, so avoid
patterns like get_dirname(strdup(x)). Writing to
cf_path.toUtf8().data() is fine btw, toUtf8() returns new memory.

This fixes two memleak reported by LeakSanitizer via fileset_add_dir and
MainWindow::captureFileReadFinished (both via cf_callback_invoke).

Change-Id: I0f1528763e77e1f55b54b6674c890a9d02302ee8
Reviewed-on: https://code.wireshark.org/review/13691
Petri-Dish: Dario Lombardo 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  36cf75e   CIP/ENIP: Enhance Info column display
adds  8899e00   Fix memleaks related to get_dirname


Summary of changes:
 fileset.c   |4 ++--
 ui/gtk/main.c   |   12 ++--
 ui/qt/main_window.cpp   |8 
 ui/qt/main_window_slots.cpp |6 +++---
 wireshark-qt.cpp|4 ++--
 5 files changed, 17 insertions(+), 17 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 2a2cb9d: Couchbase: Dissect multi-path mutation responses

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2a2cb9dace5179565dcdd87bd60aef1c94440af4
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

2a2cb9d by Dave Rigby (da...@couchbase.com):

Couchbase: Dissect multi-path mutation responses

Multi-path mutation responses can have a variable number of values
encoded in them:

- Successful requests have 0..N values, one for each mutation which
  wishes to return a value (e.g. SUBDOC_COUNTER)

- Unsuccessful requests have 1 value, specifying the index and status
  of the first failing mutation

Add support for decoding a variable number of response values.

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


Actions performed:

from  8899e00   Fix memleaks related to get_dirname
adds  2a2cb9d   Couchbase: Dissect multi-path mutation responses


Summary of changes:
 epan/dissectors/packet-couchbase.c |   73 ++--
 1 file changed, 53 insertions(+), 20 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 29b0ada: fuzz-test: Print the memory limit if ASan is enabled.

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=29b0adac8211b3da2d5c37b8fcacf9a631ba95ab
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

29b0ada by Gerald Combs (ger...@wireshark.org):

fuzz-test: Print the memory limit if ASan is enabled.

Update the 'ulimit -v' FAQ URL while we're here.

Change-Id: I0e1b007295bf609d7a585087b00c97eae01501c2
Reviewed-on: https://code.wireshark.org/review/13696
Reviewed-by: Gerald Combs 
Reviewed-by: Anders Broman 


Actions performed:

from  d5c1449   [text2pcap] Fix parsing of hash sign at the end of the line
adds  29b0ada   fuzz-test: Print the memory limit if ASan is enabled.


Summary of changes:
 tools/fuzz-test.sh |7 +--
 1 file changed, 5 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 2e1c181: OSPF: Wrong interpretation of Instance ID value in OSPFv3 packet

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2e1c181996ad4029b12fbeec5866d3cdaeb04714
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

2e1c181 by Alexis La Goutte (alexis.lagou...@gmail.com):

OSPF: Wrong interpretation of Instance ID value in OSPFv3 packet

Reported by Garri

Bug:12072
Change-Id: I6f35bdcd54f71138e58048086bf291e5be7967dd
Reviewed-on: https://code.wireshark.org/review/13697
Reviewed-by: Jaap Keuter 
Petri-Dish: Jaap Keuter 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  ad45802   Sync ASN.1 templates and generated code (spelling fixes)
adds  2e1c181   OSPF: Wrong interpretation of Instance ID value in OSPFv3 
packet


Summary of changes:
 epan/dissectors/packet-ospf.c |   10 +-
 1 file changed, 5 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 6991149: [airpdcap] Add support to decrypt TDLS traffic

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6991149557ec9f82f2e90e1f95e23621dced5dfb
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

6991149 by Cedric Izoard (cedric.izo...@ceva-dsp.com):

[airpdcap] Add support to decrypt TDLS traffic

- When scanning for keys, check for TDLS action frames
  (need to have TLDS response or confirm to derive the key)
- When deriving PTK, also check MIC to ensure the key has been correctly
  computed.
- As SA is between two STAs (and not STA and AP), store highest MAC
  address in sa.bssid, and the other one in sa.sta
  => Add new function (AirPDcapGetSaAddress) that will check for TDLS
  case.
- Add test in decryption suite

Bug: 11312
Change-Id: Ieccb6a23a0ffbf3b705dac9b67c856ae2d3eeca9
Reviewed-on: https://code.wireshark.org/review/13664
Petri-Dish: Alexis La Goutte 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  2e1c181   OSPF: Wrong interpretation of Instance ID value in OSPFv3 
packet
adds  6991149   [airpdcap] Add support to decrypt TDLS traffic


Summary of changes:
 epan/crypt/airpdcap.c  |  306 +---
 test/captures/wpa-test-decode-tdls.pcap.gz |  Bin 0 -> 3423 bytes
 test/suite-decryption.sh   |   23 +++
 3 files changed, 296 insertions(+), 33 deletions(-)
 create mode 100644 test/captures/wpa-test-decode-tdls.pcap.gz
___
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 d5c1449: [text2pcap] Fix parsing of hash sign at the end of the line

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d5c1449d1b7ae0a2a04e401f9015a516ba7201f9
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

d5c1449 by Vasil Velichckov (vvvelich...@gmail.com):

[text2pcap] Fix parsing of hash sign at the end of the line

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


Actions performed:

from  f6ff90f   RTPS: Added custom type dissection support for RTPS batches
adds  d5c1449   [text2pcap] Fix parsing of hash sign at the end of the line


Summary of changes:
 test/captures/text2pcap_hash_eol.txt |   10 ++
 test/suite-text2pcap.sh  |   29 +
 text2pcap-scanner.l  |8 
 ui/text_import_scanner.l |8 
 4 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 test/captures/text2pcap_hash_eol.txt
___
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 f6ff90f: RTPS: Added custom type dissection support for RTPS batches

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f6ff90fed6b18af3885d2cd66452004977cbcf24
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

f6ff90f by Juanjo Martin (jua...@rti.com):

RTPS: Added custom type dissection support for RTPS batches

In RTPS, regular samples are serialized with the format
 and thus, the dissection of the
encapsulation was suggested to be done in the custom dissector.

However, batches are serializing the encapsulation only once as
. This makes us need to dissect
the encapsulation in the RTPS dissector and providing as (void*) data
to the custom dissector. This way we support the regular samples
dissection as well as the batches dissection.

I have defined rtps_dissector_data in packet-rtps.h and I suggest
we include that header file when we want to write a custom dissector.

Bug: 12029
Change-Id: I74ed4c31484f9a99ad6c44c6c34cc52be2adb7c8
Reviewed-on: https://code.wireshark.org/review/13413
Petri-Dish: Alexis La Goutte 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  2a2cb9d   Couchbase: Dissect multi-path mutation responses
adds  f6ff90f   RTPS: Added custom type dissection support for RTPS batches


Summary of changes:
 epan/dissectors/packet-rtps.c |   48 +
 epan/dissectors/packet-rtps.h |6 ++
 2 files changed, 40 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 5d3d330: make-version: Silence one diagnostic message with a verbose option

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5d3d33024d8a15d671a16e97a5bf11eea9892ee3
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

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

make-version: Silence one diagnostic message with a verbose option

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


Actions performed:

from  29b0ada   fuzz-test: Print the memory limit if ASan is enabled.
adds  5d3d330   make-version: Silence one diagnostic message with a verbose 
option


Summary of changes:
 make-version.pl |   13 ++---
 1 file changed, 10 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 a47c850: suite-mergecap: fix indent (use tabs)

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a47c850d50d17d192f6017fb57094324c8693c3d
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

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

suite-mergecap: fix indent (use tabs)

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


Actions performed:

from  0538470   Suite test: fix modelines for bash script (emac)
adds  a47c850   suite-mergecap: fix indent (use tabs)


Summary of changes:
 test/suite-mergecap.sh |  312 
 1 file changed, 156 insertions(+), 156 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 d8e2768: CAPWAP: fix 'capwap.control.fortinet.ebptag.ebp' exists multiple times with NOT compatible types: FT_ETHER and FT_UINT8

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d8e276883fd1313c978ac4d58f49e07d396bef23
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

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

CAPWAP: fix 'capwap.control.fortinet.ebptag.ebp' exists multiple times with 
NOT compatible types: FT_ETHER and FT_UINT8

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


Actions performed:

from  e9fc9c4   MS NLB: fix msnlb.reserved' exists multiple times with NOT 
compatible types: FT_NONE and FT_BYTES
adds  d8e2768   CAPWAP: fix 'capwap.control.fortinet.ebptag.ebp' exists 
multiple times with NOT compatible types: FT_ETHER and FT_UINT8


Summary of changes:
 epan/dissectors/packet-capwap.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 a3f23d9: MPLS : fix exists multiple times with NOT compatible types

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a3f23d9a1087fdc068e61a4a1881277e55ce69b4
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

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

MPLS : fix exists multiple times with NOT compatible types

'ospf.mpls.bc' exists multiple times with NOT compatible types: FT_FLOAT 
and FT_UINT8
'ospf.v3.lsa.link_local_interface_address.ipv6' exists multiple times with 
NOT compatible types: FT_IPv4 and FT_IPv6

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


Actions performed:

from  0ce188a   HTTP2: fix 'http2' exists multiple times with NOT 
compatible types: FT_NONE and FT_PROTOCOL
adds  a3f23d9   MPLS : fix exists multiple times with NOT compatible types


Summary of changes:
 epan/dissectors/packet-ospf.c |4 ++--
 1 file changed, 2 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 1b1b934: M3AP: fix dissection of IPAddress field

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1b1b93429af01b13550c985978fa3808296d7f5d
Submitter: Anders Broman (a.broma...@gmail.com)
Changed: branch: master
Repository: wireshark

Commits:

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

M3AP: fix dissection of IPAddress field

Bug: 12070
Change-Id: Ib516cc3ea7e00a6c4fe1661b9c78b0f6c6a25da6
Reviewed-on: https://code.wireshark.org/review/13689
Reviewed-by: Pascal Quantin 
Petri-Dish: Pascal Quantin 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Anders Broman 


Actions performed:

from  0421e78   Fixed bug when the actual remaining command data is less 
than the size specified in the EtherCAT mailbox header.
adds  1b1b934   M3AP: fix dissection of IPAddress field


Summary of changes:
 asn1/m3ap/m3ap.cnf   |   12 -
 asn1/m3ap/packet-m3ap-template.c |   22 +++--
 epan/dissectors/packet-m3ap.c|   92 --
 3 files changed, 89 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