Commit Graph

57881 Commits

Author SHA1 Message Date
Jeff Morriss 3a42b55ac9 idl2wrs: don't use -1 for the protocol-item length.
It doesn't work any more for empty (length==0) PDUs.

Similar to bug 10646/Ifb96768969a43c59367b73e7bb940ceeb02cf6b0 (for RPC).

Untested as I'm not set up to build IDL dissectors now.

Bug: 11134
Change-Id: I77aacc2590acbacbe02edb1768e754f92f87bc23
Reviewed-on: https://code.wireshark.org/review/8163
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-23 02:09:16 +00:00
Thomas Wiens 7ccab8a6e1 Added decoding of BSEND/BRECV communication
Change-Id: Ie02f809e69cf9e7980d90ab02a2d4f34a465e0cd
Reviewed-on: https://code.wireshark.org/review/8170
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-23 01:00:55 +00:00
Thomas Wiens c958e845db Added display and filteroptions for byte- and bitaddress
Change-Id: I48f39c148006e25fa98b75656cbb11496bce9d25
Reviewed-on: https://code.wireshark.org/review/8169
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-23 00:58:11 +00:00
Thomas Wiens 54bed8b52e Added transport size double-integer
Change-Id: I3b5452ef8cfd4fac414b2c5bdd7926ea679b8029
Reviewed-on: https://code.wireshark.org/review/8167
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 23:26:12 +00:00
Michael Mann 8d6324f759 Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list]
Part 2 of a few

Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4
Reviewed-on: https://code.wireshark.org/review/8165
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 23:24:45 +00:00
Tobias Brunner 825aa502e7 Fix length calculation of IKEv2 REDIRECT notify with nonce data
Change-Id: Ia20569e89c3ae1d9ccdec73cc25c622e64117536
Reviewed-on: https://code.wireshark.org/review/8166
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-22 15:32:19 +00:00
Michal Labedzki 5e6acdddc1 Add androiddump to debian package
Also add extcap manpage.

Change-Id: I3de0d7957de6a22da69953ca29ad676d42a163fa
Reviewed-on: https://code.wireshark.org/review/8130
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-04-22 11:00:20 +00:00
Jeff Morriss 97499c1f25 Add VALS_EXT_PTR to decorate pointers to value_string_ext's in hfinfo.
This allows checkAPIs to continue checking the 'convert' field for correctness
when dissectors use value_string_ext_new() to build their value_string_ext's
(without resorting to tricks like getting the address of the dereferenced
pointer).

This will be used to resolve the checkAPIs failure in patch set 3 of
Ia5c96b1f6f1fe3a9521b3d70142889e3881fae5e .

Change-Id: I700d86b9076f077706d34000f5a6aa5c96351f69
Reviewed-on: https://code.wireshark.org/review/8162
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-22 06:08:58 +00:00
Jeff Morriss 4461f7271d Add special handling of the (derived) AppId AVP type so that we can maintain
one (and only one) Application ID list.

This means we don't have to list all the Application IDs several times in the
XML file.  Collapse those lists into one (much more complete, now) list while
also fixing URIs for several of the specifications (and making it clear for
others that we don't have access to the specification--by declaring their
URI to be "none").

Add a bunch more entries to the list of application IDs.

Change-Id: Ia5c96b1f6f1fe3a9521b3d70142889e3881fae5e
Reviewed-on: https://code.wireshark.org/review/8147
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-22 05:51:45 +00:00
Jeff Morriss ecc3369c05 Misc. Diameter XML cleanups.
Consistently used (derived) type Enumerated (rather than Unsigned32 or
Integer32) when the AVP is of type Enumerated.

Use a uri of "none" when we don't have access to the specification.
Update the URI of an Application or two.

Clean up white space and formatting.

Change-Id: Iad677db186469b7d8c4a23b7a7fca6c357dbc012
Reviewed-on: https://code.wireshark.org/review/8164
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-22 01:50:23 +00:00
michal.orynicz 448e122ea5 [Androiddump] Fix CMake install path for androiddump
Changed path from "share" to one based on plugns path
For example /usr/local/lib/wireshark/extcap

Change-Id: I8f4a9f274b1cec897ed45de9e05679ac3f230301
Reviewed-on: https://code.wireshark.org/review/8161
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2015-04-21 12:49:48 +00:00
Jeff Morriss 847e5179dc Allow the definition of AVPs within vendor IDs.
This allows for a more natural organization of AVP definitions: they can now
be grouped by application (including the base application) or vendor ID. This
means we can stop using the "workaround" (for those vendors who define AVPs
but don't have their own application ID) of finding some random application ID
to put in a vendor-specific xml file just to satisfy the parser.

Rework a couple of Vendor-specific xml files as an example.

Note: this does mean that vendor IDs can no longer be defined inside of the
base or other application.  If that's a problem the parser could be made
(through some duplication of code) to understand the old format too.

Change-Id: I5119f0dc7f8e3bbf59e2207046a8bb0f42ab0ca1
Reviewed-on: https://code.wireshark.org/review/8141
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-21 01:55:50 +00:00
Guy Harris 8b720910d2 Calculate *Peek tagged timestamps in fixed-point.
Add a variant of filetime_to_nstime() that takes a value that's like a
FILETIME but in units of nanoseconds rather than tenths of a
microsecond, and use that.  (It looks as if they might just get FILETIME
values from the OS and multiply them by 100, as the nanosecond-FILETIME
values appear to be multiples of 100 in the captures I've seen, but they
might have chosen nanosecond resolution in case they need to support a
higher-resolution time stamp source, so we don't assume that the values
will always be a multiple of 100.)

Change-Id: If6a1cb2cb673688b042eb113b79cfd267f5454a5
Reviewed-on: https://code.wireshark.org/review/8150
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-21 01:28:15 +00:00
Evan Huus c35f2ccb44 reassembly: address a 15-year old XXX comment
Question: "what if we didn't capture the entire fragment due to a too-short
          snapshot length?"
Answer: An assertion fails and we leak a bunch of memory.

Don't do that.

Bug: 11129
Change-Id: I0adfb217f0e66ae8f5f6255a4caf7ff940826b59
Reviewed-on: https://code.wireshark.org/review/8128
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-21 01:05:17 +00:00
Guy Harris 63e294bead Don't use FT_STRINGZ for something that's not a string.
Change-Id: Idd2f0ab5237ab2596557214fe9853e7b2259a34d
Reviewed-on: https://code.wireshark.org/review/8146
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-20 21:38:26 +00:00
Guy Harris 57d332dc0a Get rid of trailing white space.
Change-Id: I83ba78a9f153f4a193550c5069182b9203b28edb
Reviewed-on: https://code.wireshark.org/review/8144
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-20 20:53:45 +00:00
Guy Harris 94dc9cd113 Have a common routine to convert FILETIME to nstime_t.
We had several copies of that code; put it into a filetime_to_nstime()
routine in wsutil, and call that common routine instead.

Change-Id: I1eb5579c36c129ff8d23f9212285ab3f63be0f43
Reviewed-on: https://code.wireshark.org/review/8142
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-20 20:41:38 +00:00
Graham Bloice 4e9ff477d9 CMake minor updates
Fix up generation messages for Windows build
Remove some superfluous Lua messages

Change-Id: I405e7edfcb043fc842fe4f0cca8d23d5755527f9
Reviewed-on: https://code.wireshark.org/review/8138
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-20 16:46:38 +00:00
Alexis La Goutte 262625b7ba OpenSafety: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Iccd80450835946abbe68d66fb4ccbc1c799e6065
Reviewed-on: https://code.wireshark.org/review/8137
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-20 14:46:25 +00:00
Evan Huus 263564f175 sv: remove #if0'd code
we can always get it back from git if we want

Change-Id: I61911628541cf4ed4be20e736e41fbaa58978d75
Reviewed-on: https://code.wireshark.org/review/8124
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-20 08:32:15 +00:00
anilkumar911 1c6c397203 Make offset unsigned int.
Change-Id: Ieb7f8a7735b8dd73f180a385294c3b8ca7ceaefb
Reviewed-on: https://code.wireshark.org/review/8060
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-20 07:51:00 +00:00
Guy Harris 3695abdaf9 Make various structure members the right size for time-in-seconds.
I.e., make them time_t's.

Change-Id: I102e9f585ae2798927757fe7f0f7a5a3fa251ec2
Reviewed-on: https://code.wireshark.org/review/8134
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-20 07:48:21 +00:00
Guy Harris 7fa7422a1e Visual Networks captures have only millisecond resolution.
Change-Id: I59d7a6b5e29a068fd820075c913ac3c546593b9e
Reviewed-on: https://code.wireshark.org/review/8133
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-20 07:20:58 +00:00
Guy Harris ff4ca0adb9 Simplify the calculation of the time stamp.
The time is calculated based on a 32-bit "seconds since the Epoch" value
for the start time and a 32-bit delta from that time, in milliseconds.
We can just split that delta into seconds and milliseconds, add the
seconds to the start time to get the seconds part of the time stamp, and
multiply the milliseconds by 1,000,000 to get the nanoseconds part of
the time stamp.  The only 64-bit arithmetic needed is adding the seconds
to a 64-bit version of the start time (just in case seconds+start time
goes past Y2.038K).

Change-Id: Id7c4c6255870627f81fc99dae919abaf47efc710
Reviewed-on: https://code.wireshark.org/review/8132
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-20 07:14:20 +00:00
Guy Harris bba29ddcf4 The previous change doesn't work; do it right.
The correct bit has to be set in the value passed in; create a
proto_tree_add_boolean64() that takes a 64-bit argument and use that.

Change-Id: I28eaab38308baa908bdc1b043b2f0b87a17afe0d
Reviewed-on: https://code.wireshark.org/review/8131
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-20 07:06:30 +00:00
Jeff Morriss 9abd4a288e Add Tekelec (now Oracle) AVPs.
Untested; taken from the document 910-6828-001 Revision A (found on the web).

Change-Id: Ibf312a0a15c5c64ec16e636814febb0e996fe5f2
Reviewed-on: https://code.wireshark.org/review/8110
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-20 06:38:44 +00:00
Evan Huus b3caf8917c wimax: replace deprecated tvb_length calls
Change-Id: I9db1051e065762b826973ecbc2dba460a7f89013
Reviewed-on: https://code.wireshark.org/review/8123
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-20 06:38:00 +00:00
Evan Huus 8844fbc4f6 replace some deprecated tvb_length calls
Change-Id: I18152e75aec2eedccad4d393c1b4b493cd7b406d
Reviewed-on: https://code.wireshark.org/review/8125
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-20 06:36:38 +00:00
Guy Harris d47373f278 Make sure we handle Booleans even with the upper 32 bits set.
Just pass 1 or 0 to proto_tree_add_boolean() depending on whether the
64-bit value is non-zero or zero.

Change-Id: I5b55c9aff4e559fb8e62bd96ae2b0b34e45189fa
Reviewed-on: https://code.wireshark.org/review/8129
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-20 01:52:28 +00:00
Guy Harris 1edbd5a875 Don't use proto_tree_add_uint() to add FT_BOOLEAN values.
In proto_item_add_bitmask_tree(), if use_value is true, base the routine
we use to add the item to the tree on the type of the field being added.

Also, use DISSECTOR_ASSERT_NOT_REACHED(), not g_assert_not_reached(), to
catch types that aren't integral or Boolean.

Change-Id: I6ff9867bddcae16ddf8b689b48fdc93c6f949105
Reviewed-on: https://code.wireshark.org/review/8127
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-19 21:27:20 +00:00
Guy Harris 9194aab0ab Use 64-bit fixed point to calculate time stamps.
Change-Id: I77c470937366dbaf50adbf174569ef0676ae3658
Reviewed-on: https://code.wireshark.org/review/8126
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-19 21:10:39 +00:00
Julien STAUB 76a0edc741 zbee: add support to ZigBee power configuration cluster
Implemented full power configuration cluster according to
07-5123-04 ZigBee cluster library

Change-Id: Ic9cb9894c2153ce53e2a2762967dbdc6a4a060c2
Reviewed-on: https://code.wireshark.org/review/8032
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Julien STAUB <atsju2@yahoo.fr>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-19 19:34:53 +00:00
Peng Li 2bc5b3a8bb rtcp.psfb.fmt DissectorTable does not work in Lua plugin
Change-Id: I4e26ee5e4d9c1556d62ce01720e40848047c23e0
Reviewed-on: https://code.wireshark.org/review/8119
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>
2015-04-19 17:40:52 +00:00
Gerald Combs daafb9d700 [Automatic update for 2015-04-19]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Id9886f878c4d7422b779f1361fd9f7fcfb315982
Reviewed-on: https://code.wireshark.org/review/8120
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-19 15:08:02 +00:00
Martin Mathieson 2392e8a30d Ixiatrailer: Requires at least 15 bytes so change test in heuristic.
Change-Id: I00415fc77d2493eccdb3f0511f0a49d670e26d9d
Reviewed-on: https://code.wireshark.org/review/8118
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-19 08:40:09 +00:00
Alexis La Goutte b394aa5f1e QCustomPlot: fix division(or modulo) by zero found by Clang and Coverity (CID 1159170 & 1159171)
Change-Id: Iba9317436983bb4b3730be8b80e7b9c107ffc3a9
Reviewed-on: https://code.wireshark.org/review/8112
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-19 05:56:09 +00:00
Roland Knall fbe39cebf1 openSAFETY: Implementing a tap interface
Implementing a tap interface as well as a packet structure
 which contains all necessary information from a single
 openSAFETY frame.

 This structure is located in a separate packet-opensafety.h so
 that plugins and other programs, which want to utilize the tap
 interface, may benefit from the same defines

 The 40bit calculation was implemented in a wrong fashion,
 so that it never calculated the correct UDID

Change-Id: I62895f91d0a255a5489b9bf397a40d824a27383f
Reviewed-on: https://code.wireshark.org/review/7275
Reviewed-by: Roland Knall <rknall@gmail.com>
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>
2015-04-19 05:53:24 +00:00
Michal Labedzki 2ce04184b8 Bluetooth: OBEX: Dissect HeaderID
HeaderID is bitfield in real. There is information about
length-information in value part.

Change-Id: Ib861f658c7b56e16df8a6514de69215138a1740d
Reviewed-on: https://code.wireshark.org/review/8039
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-19 05:05:40 +00:00
Michael Mann aeb9827e4a Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list]
Part 1 of a few

Change-Id: I413f23dfa92da5488ca8a7f62ca0738b25004635
Reviewed-on: https://code.wireshark.org/review/8117
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-18 16:32:27 +00:00
Michal Labedzki 8f9aa33b29 Bluetooth: OBEX: Add DecodeAs for profile-based Application Parameters
Application Parameters are defined in profile specification.
If there is not enough infgormation to recognize profile user must have
ability to do that manually.

Also add expert info that packet is manually "Decoded As".

Change-Id: I8a735d46d365d712995cd8cc00b2f46849c8afb4
Reviewed-on: https://code.wireshark.org/review/8044
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-18 15:48:31 +00:00
Michal Labedzki 39968ac432 MIME: Allow to dissect big files
Increase file size limit for mime files that can be
loaded by Wireshark to AddressSpace/2. On 32bit machines the limit can be
2 GiB.

Change-Id: I5b38b3ebe401077f4e1e873cff4b37da560d592f
Reviewed-on: https://code.wireshark.org/review/4907
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-18 15:11:02 +00:00
Alexis La Goutte e9926ff3af ZigBee: commissioning dissection
Miscellaneous corrections in ZigBee Green Power commissioning cluster dissection.

Change-Id: I6aaf5f2c1ad5c70d1961709c0e94ab5c5af81ec7
Reviewed-on: https://code.wireshark.org/review/8094
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18 15:04:50 +00:00
Alexis La Goutte 735f08a051 GIOP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I5cd8fe72e6288578d4fa316096dfa606bf3e7aea
Reviewed-on: https://code.wireshark.org/review/8116
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18 14:53:57 +00:00
Alexis La Goutte 4b65a8dcd3 GIAS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I430e044d838b0d81bda15d3f8012b81f7247080e
Reviewed-on: https://code.wireshark.org/review/8115
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18 14:50:20 +00:00
Alexis La Goutte 0d368daead Bluetooth: OBEX: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I5c260b6af14786119a324c3fed98178ddad01c6d
Reviewed-on: https://code.wireshark.org/review/8114
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18 14:48:45 +00:00
Alexis La Goutte 1c86217387 Bluetooth: HFP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I1509a9ee9b136c15b5da8ff88fa6eadab3dd7f99
Reviewed-on: https://code.wireshark.org/review/8113
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18 14:46:46 +00:00
Alexis La Goutte 3d2516715a 802.11 fix unchecked return value (CID 1293628)
following ge243b0041 check the last add_tagged_field for avoid a Coverity warning
(Yes the code is already safe..)

Ping-Bug: 11110
Change-Id: Iaceb8cf9c91de426bc5e5408b4271091cab57862
Reviewed-on: https://code.wireshark.org/review/8084
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18 06:47:32 +00:00
Alexis La Goutte adf0d671fd proto(.h): fix '@return' command used in a comment that is attached to a function returning void [-Wdocumentation]
Change-Id: Ice88ddf2d35293f23be2d5a61a6ae77ed540f886
Reviewed-on: https://code.wireshark.org/review/8107
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18 06:46:05 +00:00
Gerald Combs 3d7b728173 Make androiddump loadable on OS X.
Make sure the target location for extcap executables and extcap_dir
match on OS X.

Set the extcap directory to Contents/MacOS/extcap. The Mac Developer
Library documentation doesn't explicitly define "Resources", but
examples include data files and not executables. It does state that
executables shouldn't go into PlugIns.

Make sure we rpathify androiddump.

Change-Id: If36c762e2a1991c26e5c01a870deaf191bcf9f94
Reviewed-on: https://code.wireshark.org/review/8093
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-17 18:08:36 +00:00
Jeff Morriss f2070bdbf9 Consistently used (derived) type Enumerated (rather than Unsigned32 or
Integer32) when the AVP is of type Enumerated.

Just for correctness.

Change-Id: Ia485d6e06ca16d6da82aa5d1b60025120e45242f
Reviewed-on: https://code.wireshark.org/review/8109
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-17 17:50:18 +00:00