Commit Graph

54899 Commits

Author SHA1 Message Date
Pascal Quantin a3c4133847 tshark: fix -H option
The dump of the address info list must be differed to the end of the processing so as to know which host name was actually used in the capture

Bug: 10507
Change-Id: I44dbfae918d4ae92f9740c309804c7ff21bb4e1b
Reviewed-on: https://code.wireshark.org/review/4327
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-27 12:13:06 +00:00
Guy Harris 7477a46f92 Get rid of some unused members of wtapng_simple_packet_t.
Change-Id: I790d99cefdd58f01ec4a792d66144634862e7427
Reviewed-on: https://code.wireshark.org/review/4331
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-27 06:41:03 +00:00
Guy Harris 15569c6d1c Regenerate PIDL dissectors with our current PIDL.
Change-Id: I63a1874d157c55df6c3c3f69c68098528adbb384
Reviewed-on: https://code.wireshark.org/review/4330
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-27 01:28:05 +00:00
Guy Harris 8d0b793297 "declare" apparently isn't a valid keyword; use typedef instead.
These changes came from the versions of those files at the tip of the
Samba trunk, and fix the failures to compile with pidl.

Change-Id: Ifc3276d4bc2ff1cfdb19819811f5b8d1b91961b5
Reviewed-on: https://code.wireshark.org/review/4329
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-27 01:26:38 +00:00
Gerald Combs 1749e5eace Qt: Adjust X11 font search order.
Liberation Mono appears to be the preferred font nowadays.

Change-Id: Ie953bdb8ba77df6486607dc076daa24225b2f08f
Reviewed-on: https://code.wireshark.org/review/4326
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-26 22:56:28 +00:00
Guy Harris a2681cc199 Note that errors are generated for dnsserver.idl and eventlog.idl.
Also fix a typo.

Change-Id: Id0713fbb722e88a911cae4ef4371b528fe73e048
Reviewed-on: https://code.wireshark.org/review/4321
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 21:13:34 +00:00
Guy Harris 24ced90c7f White space and typo cleanups.
Change-Id: If064178a383ce805ed6f440a1a9d3642a706496c
Reviewed-on: https://code.wireshark.org/review/4320
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 20:15:03 +00:00
Guy Harris ef106f4c19 Update to latest version from Samba Git repository.
Comments from Samba Git log:

commit ee2148754e2e2604ac918343fa8769a25523eb49
Author: Stefan Metzmacher <metze@samba.org>
Date:   Tue Aug 26 21:33:05 2014 +0200

    pidl/wscript: remove --with-perl-* options

    These are not needed anymore as we have useful defaults now.

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Michael Adam <obnox@samba.org>

commit b537c5a340bae2accbf35a4ec5eab7074b90f0b1
Author: Michael Adam <obnox@samba.org>
Date:   Mon Aug 25 23:57:23 2014 +0200

    pidl: fix the perl module search path (use lib ...) when installing pidl.

    This way, pidl can also run with modules installed under the $prefix.

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Michael Adam <obnox@samba.org>

commit 191fc0e541e7c9d0a1095dc287402df9947ce779
Author: Michael Adam <obnox@samba.org>
Date:   Thu Sep 4 01:38:14 2014 +0200

    pidl/wscript: don't check for perl again.

    This is done at the toplevel now.

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
    Signed-off-by: Michael Adam <obnox@samba.org>
    Signed-off-by: Stefan Metzmacher <metze@samba.org>

commit 9e591e3d619d127c5ec5f6ac86326c84f59878fa
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:59:45 2014 +0100

    pidl-waf: Check for system perl(Parse::Yapp::Driver).

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit 410ada45b7041be6976fcfefadccbb99212a15a3
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:59:41 2014 +0100

    pidl-waf: Add a function to check for a system perl module.

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit 17244ef750f699b30ff7ff3a71264f4c76adad6d
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:53:10 2014 +0100

    pidl-waf: Install pidl modules to the perl vendorlib directory.

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit 0bb6b0102f6fa21e6c9f8010421386a660c5a5e0
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:54:09 2014 +0100

    pidl-waf: Remove unused variable pidl_src.

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit 87976b4e45bd71b086e9201f0d0a563b9071ca4a
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:46:01 2014 +0100

    Revert "pidl: Install pidl files corrently."

    This reverts commit cee11cfa4544425099268cd32393169afb4bb107.

    Reviewed-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit c2d58c3c2059ef3d43f876df547cbc7256235563
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:45:51 2014 +0100

    Revert "waf: Add option to specify perl vendor dir."

    This reverts commit 9b200555fec2e33da9521db388d1839375aa8d83.

    Reviewed-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit c46aaf1102da5e8ba53e9f89f2f756fe8dce83c5
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:45:35 2014 +0100

    Revert "pidl: Make perl(Parse:Yapp:Driver) installation optional."

    This reverts commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838.

    Reviewed-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838
Author: Andreas Schneider <asn@samba.org>
Date:   Thu Feb 27 13:14:56 2014 +0100

    pidl: Make perl(Parse:Yapp:Driver) installation optional.

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer@samba.org>

    Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
    Autobuild-Date(master): Thu Feb 27 18:47:03 CET 2014 on sn-devel-104

commit 9b200555fec2e33da9521db388d1839375aa8d83
Author: Andreas Schneider <asn@samba.org>
Date:   Tue Feb 25 17:16:37 2014 +0100

    waf: Add option to specify perl vendor dir.

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Kai Blin <kai@samba.org>

    Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
    Autobuild-Date(master): Thu Feb 27 11:48:54 CET 2014 on sn-devel-104

commit cee11cfa4544425099268cd32393169afb4bb107
Author: Andreas Schneider <asn@samba.org>
Date:   Tue Feb 25 16:04:24 2014 +0100

    pidl: Install pidl files corrently.

    Globbing is a really bad idea in installtion system. One of them is if
    you use patch -b to create a backup, you will end up installing the
    backup file too!

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Kai Blin <kai@samba.org>

Change-Id: I9c4491f0d74c24d7c45a59e98825c789097a0c7b
Reviewed-on: https://code.wireshark.org/review/4318
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 19:31:15 +00:00
Guy Harris 6700a12a3c Update to current version from Samba Git repository.
Changes from Samba Git log:

commit fac24e11655c554cd3113dfb6fc918a0fd3c880c
Author: Michael Adam <obnox@samba.org>
Date:   Mon Aug 25 23:58:48 2014 +0200

    pidl: remove superfluous "use lib ...".

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Michael Adam <obnox@samba.org>

Change-Id: I8a2460a9168ef5989e9f5e95b51cca73987b80a4
Reviewed-on: https://code.wireshark.org/review/4317
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 19:28:03 +00:00
Guy Harris 44551d39b8 Update to latest version from Samba Git repository.
Changes from Samba Git log:

commit cf75ef9f73f2cdbf2a039bbc9468f5da6a14834e
Author: Stefan Metzmacher <metze@samba.org>
Date:   Fri May 9 11:49:10 2014 +0200

    pidl/lib/wscript_build: make use of PERL_LIB_INSTALL_DIR

    Bug: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Andreas Schneider <asn@samba.org>

    Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
    Autobuild-Date(master): Sat May 10 01:37:33 CEST 2014 on sn-devel-104

commit ee8f98f26a3d6f02a0d10ceeac1194675d505246
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 16:00:54 2014 +0100

    pidl-waf: Only install Yapp::Driver if it is not available.

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

    Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
    Autobuild-Date(master): Thu Mar  6 23:30:47 CET 2014 on sn-devel-104

commit b7b0ca1ba9067362bb8a4b901f3a7f2f3bcbd6a1
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:55:46 2014 +0100

    pidl-waf: Do not glob to install pidl modules.

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit 17244ef750f699b30ff7ff3a71264f4c76adad6d
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:53:10 2014 +0100

    pidl-waf: Install pidl modules to the perl vendorlib directory.

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit 87976b4e45bd71b086e9201f0d0a563b9071ca4a
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:46:01 2014 +0100

    Revert "pidl: Install pidl files corrently."

    This reverts commit cee11cfa4544425099268cd32393169afb4bb107.

    Reviewed-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit c2d58c3c2059ef3d43f876df547cbc7256235563
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:45:51 2014 +0100

    Revert "waf: Add option to specify perl vendor dir."

    This reverts commit 9b200555fec2e33da9521db388d1839375aa8d83.

    Reviewed-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit c46aaf1102da5e8ba53e9f89f2f756fe8dce83c5
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:45:35 2014 +0100

    Revert "pidl: Make perl(Parse:Yapp:Driver) installation optional."

    This reverts commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838.

    Reviewed-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838
Author: Andreas Schneider <asn@samba.org>
Date:   Thu Feb 27 13:14:56 2014 +0100

    pidl: Make perl(Parse:Yapp:Driver) installation optional.

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer@samba.org>

    Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
    Autobuild-Date(master): Thu Feb 27 18:47:03 CET 2014 on sn-devel-104

commit 9b200555fec2e33da9521db388d1839375aa8d83
Author: Andreas Schneider <asn@samba.org>
Date:   Tue Feb 25 17:16:37 2014 +0100

    waf: Add option to specify perl vendor dir.

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Kai Blin <kai@samba.org>

    Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
    Autobuild-Date(master): Thu Feb 27 11:48:54 CET 2014 on sn-devel-104

commit cee11cfa4544425099268cd32393169afb4bb107
Author: Andreas Schneider <asn@samba.org>
Date:   Tue Feb 25 16:04:24 2014 +0100

    pidl: Install pidl files corrently.

    Globbing is a really bad idea in installtion system. One of them is if
    you use patch -b to create a backup, you will end up installing the
    backup file too!

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Kai Blin <kai@samba.org>

Change-Id: I4372f2c0854743a0339c7d85ace9e67ce9f8bd02
Reviewed-on: https://code.wireshark.org/review/4316
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 19:22:12 +00:00
Guy Harris 788de8d558 Update to current version from Samba Git repository.
Changes from Samba Git log:

commit d29c143fae4b67c9680a0b9773db3461f2d0d2b7
Author: Stefan Metzmacher <metze@samba.org>
Date:   Thu Mar 27 14:56:23 2014 +0100

    pidl:Samba4/Python: add interface.abstract_syntax() to each interface

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Change-Id: I9f4650c603ea8b2eff05e7b79d7f44452e1337ab
Reviewed-on: https://code.wireshark.org/review/4315
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 19:17:40 +00:00
Guy Harris d720fe8f77 Update to the latest version from the Samba Git repository.
Changes from the Samba Git log:

commit 2ba9453e9ff5d911a146e786ff8878ef67717366
Author: Stefan Metzmacher <metze@samba.org>
Date:   Thu Sep 26 20:38:12 2013 +0200

    pidl:NDR/Client: avoid useless memcpy()

    If the src and dest pointer of memcpy would be the same
    we should avoid it in order to avoid valgrind warnings.

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Andreas Schneider <asn@samba.org>

commit f50b561336c7b6c08300e6e477859d1f9fab62c2
Author: Stefan Metzmacher <metze@samba.org>
Date:   Thu Sep 26 01:20:10 2013 +0200

    pidl:NDR/Client: fix dcerpc_function() with [out,ref] pointers

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Andreas Schneider <asn@samba.org>

commit 662fc2de8c2896503026a2a4052ed1ea8ce78af5
Author: Stefan Metzmacher <metze@samba.org>
Date:   Fri Aug 30 08:54:10 2013 +0200

    pidl:NDR/Client: simplify tevent_req_nterror() usage

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Andreas Schneider <asn@samba.org>

commit 02c34fe4e51b5e62157eaf2de1d0aaf9fc6b8d72
Author: Stefan Metzmacher <metze@samba.org>
Date:   Fri Aug 30 08:53:18 2013 +0200

    pidl:NDR/Client: add missing TALLOC_FREE(subreq) after dcerpc_binding_handle_call_recv()

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Andreas Schneider <asn@samba.org>

Change-Id: I19017fd216df8d8d202b995305f4eb7b7a8b9a35
Reviewed-on: https://code.wireshark.org/review/4314
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 19:11:09 +00:00
Guy Harris df685fc94e Update to the latest version from the Samba Git repository.
Changes from the Samba log:

commit 3a0fa3605b8eb995a8cc4696256129893e1f6f7e
Author: Stefan Metzmacher <metze@samba.org>
Date:   Sat Sep 21 23:46:01 2013 +0200

    pidl:Samba3/ServerNDR: skip DCERPC pipe elements and leave NULL pointers.

    We don't support them anyway, but this lets us adding them to the idl
    file and only ignore it on the server.

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Andreas Schneider <asn@samba.org>

Change-Id: Idbe742fa13e5d3892343fde2b3943f38a6e90a8c
Reviewed-on: https://code.wireshark.org/review/4313
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 19:07:05 +00:00
Guy Harris bcae0488fc Update to the latest version from the Samba Git repository.
From the Samba log:

commit bfdc874e8b98c8ea147dbcc986f96ad4f73d800f
Author: Jelmer Vernooij <jelmer@samba.org>
Date:   Sat Aug 30 01:59:26 2014 +0200

    Various updates to the pidl README file.

    Remove samba3/samba4-specific comments, add comments about backends and files.

    Change-Id: Id2253ce85eab7a684b2c50d25f6f2604dc146a8e
    Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
    Reviewed-by: David Disseldorp <ddiss@samba.org>

    Autobuild-User(master): David Disseldorp <ddiss@samba.org>
    Autobuild-Date(master): Sun Aug 31 23:47:49 CEST 2014 on sn-devel-104

commit 6824f1aa67f0a75df5c94921e334c2b7c7771611
Author: Jelmer Vernooij <jelmer@samba.org>
Date:   Sat Aug 30 01:59:25 2014 +0200

    Remove trailing whitespace.

    Change-Id: I1e0948da34bac278edc62cd63dedd08112426e7a
    Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
    Reviewed-by: David Disseldorp <ddiss@samba.org>

Change-Id: Ifd445bf32aca2d30a6e501fc8c8dd030471ad284
Reviewed-on: https://code.wireshark.org/review/4312
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 19:02:42 +00:00
Gerald Combs c90acf26f8 Qt: Capture fixes.
Don't check syntax when we rebuild the CaptureFilterCombo.

Make sure we switch back to the main window when capturing fails.

Change-Id: Id4137e33a8135645f29ca7b2836c76b90f09e3ac
Reviewed-on: https://code.wireshark.org/review/4311
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-26 18:43:32 +00:00
Alexis La Goutte 69337f1fe8 Modbus: Add value 90 (0x5A) used by Unity (Schneider)
Change-Id: I205f77bccb8ca042da1a699d49844e305612aac2
Reviewed-on: https://code.wireshark.org/review/4307
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-26 14:58:54 +00:00
Alexis La Goutte 9c8f10e727 Modbus: fix indent and add modelines info
Change-Id: Idfcdaa13c24791cf2b765b02d8235e9b3a9cd775
Reviewed-on: https://code.wireshark.org/review/4306
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-26 14:58:33 +00:00
Gerald Combs 2d7c1135ed Move the console log handling code to ui/console.[ch].
Change-Id: I8e554a8e17399d78b0ef29dfb68109a219cd9f1b
Reviewed-on: https://code.wireshark.org/review/4294
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-26 14:15:45 +00:00
Alexis La Goutte ce36b20ca5 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ia0f29a491af920415d6e56f30ef436544f7d5ddf
Reviewed-on: https://code.wireshark.org/review/4303
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-26 13:22:08 +00:00
AndersBroman a7591fbb04 Added basic decoding of new IEs
Change-Id: I7982fe6ccee806b574f780cc2e96d7139a6a74c5
Reviewed-on: https://code.wireshark.org/review/4305
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-26 13:02:20 +00:00
AndersBroman 4319ab30ac Add basic dissection for new IEs
Change-Id: Ie9fc9ac4672a80c82c3b09188752c928b1e7d6c1
Reviewed-on: https://code.wireshark.org/review/4302
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-26 13:02:01 +00:00
Michal Labedzki 1275d05913 Reduce compilator warnings
warning: cast from 'const guint8 *' (aka 'const unsigned char *') to
	'const guint16 *' (aka 'const unsigned short *') increases required
	alignment from 1 to 2 [-Wcast-align]
warning: cast from 'const guint8 *' (aka 'const unsigned char *') to
	'const struct logger_entry *' increases required alignment
	from 1 to 4 [-Wcast-align]

Change-Id: I1ef8bfedb31c3f633166405689d8d788d45365db
Reviewed-on: https://code.wireshark.org/review/4236
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-09-26 09:10:38 +00:00
Pascal Quantin e179870a12 ANSI IS-637 A: remove a useless variable
Change-Id: I50077329d6e78ca39312e72eb04b7a5db85b977b
Reviewed-on: https://code.wireshark.org/review/4301
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-26 08:57:32 +00:00
Guy Harris 95dc9a9278 Update a comment as per the previous commit.
Change-Id: Ic7adba4302d4d4abff7012cf09d68246ebade922
Reviewed-on: https://code.wireshark.org/review/4296
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 06:11:59 +00:00
Guy Harris 92a0cb85f3 Renaming libtool* to glibtool* might require root permission.
Define DO_MV as "mv" or "sudo mv", depending on whether the user has
write access to /usr/local/bin, and use it to rename libtool* to
glibtool* and vice versa.

Change-Id: Ifbef4daa4521852bc200522743df9d23e7f0d1c2
Reviewed-on: https://code.wireshark.org/review/4295
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 06:06:25 +00:00
Pascal Quantin 82d1a85ad2 GTP: display SAC as BASE_HEX_DEC
Bug: 10490
Change-Id: I0afe1f2ff51f2452830bfc57210dc3a298b68cbf
Reviewed-on: https://code.wireshark.org/review/4290
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-26 04:14:18 +00:00
Pascal Quantin a26b751819 CFM: display MEP ID in decimal in OAM Y.1731 Synthetic Loss Message and Reply PDU
Bug: 10500
Change-Id: I70dab8fb86965fedbe8739e265db81fe310518cf
Reviewed-on: https://code.wireshark.org/review/4289
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-26 04:12:32 +00:00
Gerald Combs ea6fa049c9 Update the simple dialog code.
Rename simple_dialog_qt.{cpp,h} to simple_dialog.{cpp,h}. Make it a
subclass of QMessageBox. Queue messages at startup similar to GTK+.

Move the GTK+-specific simple_dialog declarations to
gtk/simple_dialog.h.

Don't yell at the user so much. Replace exclamation points with periods.

Change-Id: I1cc771106222d5e06f1f52d67ac29d6dc367cce4
Reviewed-on: https://code.wireshark.org/review/4288
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-25 22:02:43 +00:00
Roland Knall 2ee45fe2da openSAFETY: Heuristic marks packet as truncated
- There are cases, where the heuristic detection tries
   to access bytes, after a correct openSAFETY frame has
   been detected, leading to "Packet truncated" messages
   in the correct and complete detected packet

Change-Id: Ie389edf82144283ad2c15f0bf975066de01e3409
Reviewed-on: https://code.wireshark.org/review/4237
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-25 19:45:40 +00:00
Pascal Quantin 7c54eb23e5 ANSI IS-637 A: get rid of tvb_length() deprecated API
Change-Id: I40de03605c051024c604679a1e141afa841a77e9
Reviewed-on: https://code.wireshark.org/review/4287
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-25 16:11:57 +00:00
Pascal Quantin e520b2b800 ANSI IS-637-A: fix dissection of fragmented Unicode SMS
The computation of the number of characters available was wrong when the User Data Header is present

Change-Id: I2809c1460316530654a997b26cfc33c60a32fd6f
Reviewed-on: https://code.wireshark.org/review/4284
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-25 15:36:37 +00:00
Martin Mathieson db277bc749 Freeze Info column while dissecting RRC transparent container
Change-Id: I30900fd6a73ca38736b3f28eb416820f74003768
Reviewed-on: https://code.wireshark.org/review/4285
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-25 15:33:16 +00:00
AndersBroman a5a87210c6 Add comments about new IEs
Change-Id: Ibc035872ff6406830a06bcfd365047a6d8c2478f
Reviewed-on: https://code.wireshark.org/review/4283
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-25 15:06:08 +00:00
AndersBroman 0fa7b01a95 Add 3 new 3GPP AVP:s
Change-Id: I47742f83a7e515f6fc449daf9492dcf8a5a68410
Reviewed-on: https://code.wireshark.org/review/4282
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-25 15:05:35 +00:00
Evan Huus 91d1c3c5ec reassembly: fix when fragment cut off by snapshot
Also add an assertion to tvb_generic_clone_offset_len so that it throws an
error *before* allocating memory, as otherwise that memory is leaked.

Bug: 10474
Change-Id: I5036cefac16841914a59670c64979cf599bf7969
Reviewed-on: https://code.wireshark.org/review/4234
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-25 12:41:36 +00:00
Guy Harris d094eab1a3 The length of the pktap header isn't fixed, it's a field in the header.
Don't assume that, once we've dissected the fields in the header we know
about and skipped past them, that the payload follows immediately
afterwards; use the header length from the header to find the payload.

Bug: 10502
Change-Id: I645fe652240e0068d99cf00d19e3705615857d5b
Reviewed-on: https://code.wireshark.org/review/4280
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-25 08:15:58 +00:00
Guy Harris a87ea36b12 Fix a record size check.
It was being checked against the wrong value, so some invalid records
passed the check.

Also, change one comparison (rec_size is in the range [0, 65535], even
though it's in an int, so we can safely cast it to guint) and fix the
metadata length value when reading Ethernet packets.

Bug: 10495
Change-Id: I2ce5c93fe50d836ec0accfcdef31654ba6b5b7c7
Reviewed-on: https://code.wireshark.org/review/4278
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-25 07:49:54 +00:00
Guy Harris 38ae61f159 radcom_read_rec() should always read from the file specified by the fh argument.
It's called both from the read and seek-read routines, so it shouldn't
always read from the sequential handle.

Change-Id: I8cb33b9f5b7219f335b0aeeef29c479916276f89
Reviewed-on: https://code.wireshark.org/review/4276
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-25 03:33:24 +00:00
Evan Huus 42018cf08a pcapng: respect the fact that wblock->data is a union
Make sure to zero the *entire* thing, and only access it as a given type when
that's the type indicated by the (non-union) type field.

Bug: 10498
Change-Id: I3e94a9c5d399d3ee4aedcd49f1aa2d7678ecf7ce
Reviewed-on: https://code.wireshark.org/review/4273
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-25 01:25:58 +00:00
Alex Badea a1604bd5d6 test: add decryption test for isakmp with certificates
This was suggested in review 2297. Capture and key are from bug 7951.

Bug: 7951
Change-Id: I820c5e839b20ec464cc1be438633d5311f657fb2
Signed-off-by: Alex Badea <abadea@ixiacom.com>
Reviewed-on: https://code.wireshark.org/review/4143
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-24 22:06:31 +00:00
Gilles Roudiere 4652f95ee9 Added a new DSR dissector
Added a new dissector for the Dynamic Source Routing (DSR) protocol (RFC 4728)
It should correctly dissect all DSR packets, including the "Flow State
Extension" DSR packets.

See Bug #10499 for capture file

Change-Id: Ie33a1a2fe095cab19d5abfbfa8e1c79fec664a35
Reviewed-on: https://code.wireshark.org/review/4251
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-24 16:26:50 +00:00
Gerald Combs 8fc2327766 Qt: Fix preference bugs.
Make sure we set the "resolved" member of the column fmt_data struct.

Emitting WiresharkApplication::AppSignals from a modal dialog can cause
event loop problems on OS X. Queue them up in PreferencesDialog and emit
them after closing.

Change-Id: I2de77778a0448db3b87d402e431b8e5f325cbbda
Reviewed-on: https://code.wireshark.org/review/4274
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-24 16:25:40 +00:00
Martin Mathieson ffe30fb0d3 Allow the HandoverPreparationInfoPDU dissector to be looked up by name and called.
Change-Id: I9c22b74d5c3329b6c7d74547d26e940c84ffc66c
Reviewed-on: https://code.wireshark.org/review/4247
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-24 07:55:40 +00:00
Guy Harris 5f096acb45 Fix presumed cut-and-pasteo.
On errors *other* than a short read, we were driving on and processing
the non-data that we didn't read.

Change-Id: I6289ddf31ff7896918a030af9d1261bdc194e7d3
Reviewed-on: https://code.wireshark.org/review/4270
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-24 00:11:01 +00:00
Gerald Combs 31e86998fb Qt: Add zoom and column resize actions.
Plumb signals and slots for changing the text size in the main window.
Remove the bold font code from WiresharkApplication. It was only used in
ByteViewText. Adjust the icons a bit.

Bug: When we change the font preferences the packet list stops drawing
cached strings. I haven't been able to track down the cause.

Change-Id: I609d740c9f26265628fa4b7de1b75b0e56651387
Reviewed-on: https://code.wireshark.org/review/4269
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-23 22:32:53 +00:00
AndersBroman 3a85a5eb96 Add decoding of part of access network identifier option
fixes Bug 10492.

Change-Id: Ib01f457b74825e6c2a7aa1dc1d0f43ff4b104dea
Reviewed-on: https://code.wireshark.org/review/4267
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-23 15:49:46 +00:00
Gerald Combs 717ff08f32 Qt: Add the colorization action.
Change-Id: I846a48c35c4ef3bbbcf17d03885acc5be8c9a6b5
Reviewed-on: https://code.wireshark.org/review/4259
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-23 14:26:45 +00:00
Evan Huus ad6a66388d pcapng: ensure the values we now free are initialized
Should fix the remaining test suite failures.

Change-Id: I50a6cb1bf57bd6a973d4777349708b75aeb41620
Reviewed-on: https://code.wireshark.org/review/4264
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-23 04:27:59 +00:00
Gerald Combs 725538050d Try to fix dist.
Change-Id: I73d269c67a0ad5bb6f67fef8da5fc4ca86f169e3
Reviewed-on: https://code.wireshark.org/review/4263
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-23 03:44:28 +00:00
Gerald Combs d3cd4c4b28 Qt: Re-enable menu icons.
The GNOME HIG says "Where a corresponding toolbar icon exists, a menu
icon should mirror its design." The Windows and OS X HIGs say that you
should use them for common or familiar actions but otherwise avoid
clutter. I think icons in the "File" menu look like crap. Try to strike
a balance.

Use the 16x16 application icon for both the main web site and the wiki
since that's the favicon used on both sites.

Assume that "Reload" isn't used very often and remove it from the
toolbar.

Don't use a menu icon for the about box.

Other minor fixups.

Change-Id: I855211c218d266c2e9ed5acbe05a08750ab6d157
Reviewed-on: https://code.wireshark.org/review/4246
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-23 02:42:14 +00:00