[Wireshark-commits] master-2.2 3310198: Rawshark uses libwiretap, so it has to call wtap_init().

[Wireshark code review]

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

Commits:

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

Rawshark uses libwiretap, so it has to call wtap_init().

Change-Id: I4b87227e4828ebad98b22e5e5d1f3896e636582a
Reviewed-on: https://code.wireshark.org/review/19070
Reviewed-by: Guy Harris 
(cherry picked from commit bded2b681485fe9a91041688bcb41d371c9099e8)
Reviewed-on: https://code.wireshark.org/review/19721


Actions performed:

from  b011353   Clean up initialization code for programs.
adds  3310198   Rawshark uses libwiretap, so it has to call wtap_init().


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

[Wireshark-commits] master-2.2 b011353: Clean up initialization code for programs.

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b01135387e7c411c4150da498833f0e1a780b97c
Submitter: Jaap Keuter (jaap.keu...@xs4all.nl)
Changed: branch: master-2.2
Repository: wireshark

Commits:

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

Clean up initialization code for programs.

Make the init_progfile_dir() call unconditionally, even if plugins
aren't supported, as that doesn't necessarily mean nobody uses the
directory containing the executable.

Report the error the same way in all programs, and free the error string
after we're finished with it.

Make the error - and the comment before the code - reflect what
init_progfile_dir() is actually doing (the goal is to get the full
pathname of the directory *containing* the executable; that's generally
done by getting the pathname of the executable and stripping off the
name of the executable, but that's won't necessarily always be the
case).  Also note for TShark that we won't be able to capture traffic,
just as we do for Wireshark (if we don't have the pathname of the
program file, we don't have a pathname to use to find dumpcap).

Have the plugin scanner just fail silently if we weren't able to get the
plugin directory path, so we don't have to worry about calling it if
init_progfile_dir() fails.

Clean up white space while we're at it.

Change-Id: I8e580c719aab6fbf74a764bf6629962394fff7c8
Reviewed-on: https://code.wireshark.org/review/19076
Reviewed-by: Guy Harris 
(cherry picked from commit 037c64aa34d4196da5a39dfb59af16abceb1247b)
Reviewed-on: https://code.wireshark.org/review/19720
Petri-Dish: Jaap Keuter 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Jaap Keuter 


Actions performed:

from  be1d4be   Have a routine to do all the work of initializing 
libwiretap.
adds  b011353   Clean up initialization code for programs.


Summary of changes:
 capinfos.c   |   33 +++--
 captype.c|   34 +++---
 dftest.c |6 --
 editcap.c|   33 +++--
 mergecap.c   |   35 +++
 randpkt.c|   34 +++---
 rawshark.c   |3 ++-
 reordercap.c |   44 
 tfshark.c|7 +--
 tshark.c |9 +++--
 ui/gtk/main.c|5 +++--
 wireshark-qt.cpp |3 ++-
 wsutil/plugins.c |9 +++--
 13 files changed, 149 insertions(+), 106 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] buildbot failure in Wireshark 2.2 on Windows 8.1 x86

[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-2.2/builders/Windows%208.1%20x86/builds/411

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

Buildslave for this Build: windows-8.1-x86

Build Reason: The SingleBranchScheduler scheduler named 'Gerrit' triggered this 
build
Build Source Stamp: [branch refs/heads/master-2.2] 
be1d4becb03087db748f7d486fa419858d70a042
Blamelist: Jaap Keuter 

BUILD FAILED: failed test.sh

Sincerely,
 -The Buildbot



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

[Wireshark-commits] buildbot failure in Wireshark 2.2 on Ubuntu 16.04 x64

[buildbot-no-reply]

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

http://buildbot.wireshark.org/wireshark-2.2/builders/Ubuntu%2016.04%20x64/builds/362

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

Buildslave for this Build: ubuntu-16.04-x64

Build Reason: The SingleBranchScheduler scheduler named 'Gerrit' triggered this 
build
Build Source Stamp: [branch refs/heads/master-2.2] 
be1d4becb03087db748f7d486fa419858d70a042
Blamelist: Jaap Keuter 

BUILD FAILED: failed test.sh

Sincerely,
 -The Buildbot



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

[Wireshark-commits] buildbot failure in Wireshark 2.2 on Windows Server 2012 R2 x64

[buildbot-no-reply]

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

http://buildbot.wireshark.org/wireshark-2.2/builders/Windows%20Server%202012%20R2%20x64/builds/427

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

Buildslave for this Build: windows-2012r2-x64

Build Reason: The SingleBranchScheduler scheduler named 'Gerrit' triggered this 
build
Build Source Stamp: [branch refs/heads/master-2.2] 
be1d4becb03087db748f7d486fa419858d70a042
Blamelist: Jaap Keuter 

BUILD FAILED: failed test.sh

Sincerely,
 -The Buildbot



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

[Wireshark-commits] master-2.2 be1d4be: Have a routine to do all the work of initializing libwiretap.

[Wireshark code review]

URL: 
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=be1d4becb03087db748f7d486fa419858d70a042
Submitter: Jaap Keuter (jaap.keu...@xs4all.nl)
Changed: branch: master-2.2
Repository: wireshark

Commits:

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

Have a routine to do all the work of initializing libwiretap.

Have programs that use libwiretap call that routine rather than
separately calling some or all of init_open_routines(),
wtap_register_plugin_types(), and wtap_opttypes_initialize().

Also don't have routines internal to libwiretap call those.  Yes, this
means doing some initialization work when it isn't necessary, but
scattering on-demand calls throughout the code is a great way to forget
to make those calls.

Change-Id: I5828e1c5591c9d94fbb3eb0a0e54591e8fc61710
Reviewed-on: https://code.wireshark.org/review/19069
Reviewed-by: Guy Harris 
(cherry picked from commit ab07f8e0f89eb1bb2c2c61c71e44e3fd0e31cc52)
Reviewed-on: https://code.wireshark.org/review/19705
Petri-Dish: Jaap Keuter 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Jaap Keuter 


Actions performed:

from  ad406f8   Add a missing item to the release notes.
adds  be1d4be   Have a routine to do all the work of initializing 
libwiretap.


Summary of changes:
 capinfos.c  |6 ++
 captype.c   |6 ++
 editcap.c   |6 ++
 extcap/androiddump.c|3 +--
 mergecap.c  |6 ++
 randpkt.c   |   14 ++
 randpkt_core/randpkt_core.c |2 +-
 reordercap.c|6 ++
 tfshark.c   |2 +-
 tshark.c|3 +--
 ui/gtk/main.c   |3 +--
 wireshark-qt.cpp|3 +--
 wiretap/file_access.c   |7 ---
 wiretap/wtap.c  |   19 ++-
 wiretap/wtap.h  |4 
 15 files changed, 40 insertions(+), 50 deletions(-)
___
Sent via:Wireshark-commits mailing list 
Archives:https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-commits
 mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe

[Wireshark-commits] master 0212739: One more cf_merge_files_to_tempfile() call needed to be changed.

[Wireshark code review]

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

Commits:

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

One more cf_merge_files_to_tempfile() call needed to be changed.

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


Actions performed:

from  a5fe96e   Qt: Fixup drag and drop merging.
adds  0212739   One more cf_merge_files_to_tempfile() call needed to be 
changed.


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