Commit Graph

25147 Commits

Author SHA1 Message Date
Martin Kaiser 63b0d89574 if a .png file is sent on the application mmi resource, pass the file
data to the png dissector

Change-Id: I112733f97ba35d9ec497b427c64b2f5ea99fd963
Reviewed-on: https://code.wireshark.org/review/818
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-25 20:09:20 +00:00
AndersBroman d6381c6fe6 Strengthen RANAP heuristic.
Change-Id: I8f6515d2716bb633f753243b7f86d371a22ebbad
Reviewed-on: https://code.wireshark.org/review/826
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25 17:20:48 +00:00
AndersBroman 86d65a0758 Introduce wmem_ascii_strdown()
Change-Id: Icdc5a0d5033f3ab709fbf19a33ab26f609d4b1f0
Reviewed-on: https://code.wireshark.org/review/824
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-25 16:10:43 +00:00
Michal Labedzki a99a0360c4 Bluetooth: Fix wrong recognized RFCOMM services
It seems that RFCOMM service can be dynamically changed while
connection is still alive. In other words: host can connect to
remote device and set one RFCOMM service (remote service), but later
remote device can change service to one of host service without
any disconnection. This patch add support for this case.
Also improve searching for useful UUID service through SDP.

Change-Id: I9e03b9b965d6b0d9761b4a451cdeb4a1a33ca017
Reviewed-on: https://code.wireshark.org/review/808
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25 09:13:13 +00:00
Michal Labedzki ab42220b65 Bluetooth: AVDTP: Add option to disable Force Codec preference
In real option "SBC" was Default/Off, now user can choose between
Default and Force SBC Codec.

Change-Id: I605320d89fade11dc7172793bc0492bc4b319e9c
Reviewed-on: https://code.wireshark.org/review/822
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25 09:08:58 +00:00
AndersBroman e90f660cb3 Don't register in the rtp.pt table if the pt value is set to zero.
Change-Id: I17c523da0fb57ed8591f409615fe56ab18977103
Reviewed-on: https://code.wireshark.org/review/823
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25 09:06:22 +00:00
Alexis La Goutte 03d982a7bb DHCP/BOOTP: Add specific 43 Option when Class is ArubaAP or ArubaInstantAP
Change-Id: I77d898af2b6b6f413f3698bb24f4c6280898da1a
Reviewed-on: https://code.wireshark.org/review/775
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-25 08:22:23 +00:00
Hadriel Kaplan de441241ef Enhance Lua API doc generator and add more API info
This enhances the Lua API doc generator Perl script to handle
meta-information in description comments, such as bold, italics,
raw code, version info, etc.

The supported markup and codes are documented in make-wsluarm.pl.

It's not beautiful Perl code (I don't know Perl), and I'd rather
do it using Lua, but I think keeping it Perl makes more sense in
the long run.

Change-Id: I477b3ebe770075dcea9ec52708e2d6fb5758d2f4
Reviewed-on: https://code.wireshark.org/review/802
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25 05:30:11 +00:00
Guy Harris e4756ccacf Comment cleanups.
Remove some more 802.11i references, and replace a reference to the
"WEP" bit with a reference to the "Protected" bit.

Change-Id: I77b50af2b34e2bdc4c21af29b54627ed19219090
Reviewed-on: https://code.wireshark.org/review/821
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-25 03:20:12 +00:00
Guy Harris 4038fa9b0a IEEE 802.11i is dead; long live IEEE 802.11-2012.
802.11i was absorbed into a revision of the 802.11 spec, so speak of
"IEEE 802.11 RSNA EAPOL"/"wlan_rsna_eapol" until somebody comes up with
a better name for it.

Also, add in one more key flags bit that's in 802.11-2012 but not
802.11i-2004.

Change-Id: Ia825f7466f3b3d159706eb681546b5bbb4e066bf
Reviewed-on: https://code.wireshark.org/review/820
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-25 03:08:03 +00:00
Martin Kaiser 250c2b065d minor cleanup
- replace TABs with spaces
- add editor modelines
- remove unnecessary NULL checks

Change-Id: Ic6024fc4b6aec56c8cafd39c707e20485fa6cca7
Reviewed-on: https://code.wireshark.org/review/819
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-24 21:58:55 +00:00
Martin Kaiser 9c2e374433 separate function to dissect File Acknowledge APDU
Change-Id: I1824407cae4cded0680b01e9dea1de6f0408c607
Reviewed-on: https://code.wireshark.org/review/817
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-24 21:58:17 +00:00
Pascal Quantin d2ba47392e Upgrade LPPe dissector to V1_1-20140108-C
Change-Id: I1d5d4ed73825bb5cda0cc2e76e5000c38c50b601
Reviewed-on: https://code.wireshark.org/review/816
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-24 21:35:40 +00:00
Clay Jones 8aaff81d76 Add the FNET_PRIVATE ppi extension.
Look for a dissector for "ppi_fnet" and use it if found, otherwise
just display the fnet tag on the data.

Change-Id: I07009215faa8faad0e6a82468bad33f266778426
Reviewed-on: https://code.wireshark.org/review/778
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24 19:14:23 +00:00
Martin Kaiser d04cddf6d3 no need for if(tree)
Change-Id: Ia6db5839a8bbbc79a5196406e3f8d59f7ce7498a
Reviewed-on: https://code.wireshark.org/review/814
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-24 14:31:27 +00:00
AndersBroman d066376a74 Check API found: Found non-ASCII characters on line 248 ..253
Change-Id: I964690c6468f1b8cfdf63cb5784f26065d56a204
Reviewed-on: https://code.wireshark.org/review/813
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24 13:37:55 +00:00
Michal Labedzki 698e8296aa USB: Fix comments about dissector tables used in "Decode As"
Issue requested by Tomasz Mon, thanks.

Change-Id: I9931f561294ef34573c6426f17a299c8929a2341
Reviewed-on: https://code.wireshark.org/review/810
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24 12:31:14 +00:00
Michal Labedzki e01c07aadb Bluetooth: L2CAP: Fix disconnection CIDs
CID has two roles: Source CID and Destination CID. This two roles
have another two different meanings: one if frame is received, another if frame
is sent (SCID is "DCID", etc). Then using information that PDU is "request"
or "response" we can correctly recognize CID.

This should fix unrecognized L2CAP payload while there were no valid
Disconnection Request.

Change-Id: Ibcbbb9e6966873b6af12c1e3c65c6a3983aa4163
Reviewed-on: https://code.wireshark.org/review/807
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24 12:28:58 +00:00
Michal Labedzki 992c65cb1a Bluetooth: L2CAP: A little update to Core 4.1
Add some command codes seen in Core 4.1 specification.
Also add some missing fields.

Change-Id: If3761744b1ada185027a560bceb66804d7eea8ec
Reviewed-on: https://code.wireshark.org/review/806
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24 12:27:21 +00:00
Michal Labedzki 01c46852a8 Bluetooth: AVDTP: Use full name for MPF field
Change-Id: I25d359926fa5790383624378a6826c8fd5a9bd5c
Reviewed-on: https://code.wireshark.org/review/805
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24 12:25:03 +00:00
Michal Labedzki 9c370fcb29 Bluetooth: AVDTP: Improve filtering
A few more filtering name separated by "." for convention.

Change-Id: Ie1ceb0ba807e033085c43826c334933c6b178389
Reviewed-on: https://code.wireshark.org/review/804
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24 12:24:36 +00:00
Michal Labedzki 8e3e0fdce9 Bluetooth: Add Member "Company" UUIDs
Change-Id: I8f455f12eeeaa51a0699e4cc1ee639d7031ce2c6
Reviewed-on: https://code.wireshark.org/review/803
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24 12:23:58 +00:00
Alexis La Goutte 8da90a2c5a Fix Argument with 'nonnull' attribute passed null found by Clang
Change-Id: I5c84e4813d03b734afaf2a7cb3205773324f049d
Reviewed-on: https://code.wireshark.org/review/798
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-24 10:17:18 +00:00
Alexis La Goutte 30a4398318 Fix Argument with 'nonnull' attribute passed null found by Clang
Change-Id: Ie27fb4c5067c35237a5027ce6428b6cfed40b141
Reviewed-on: https://code.wireshark.org/review/797
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-24 07:37:04 +00:00
Guy Harris 2d7828794c Add a dissector table for EAPOL Key Descriptor types.
Instead of having a switch statement in the EAPOL dissector for Key
Descriptor types, have a dissector table, and:

	have the EAPOL dissector register with a dissector for the RC4
	type;

	have the 802.11 dissector register with dissectors for WPA and
	RSN types.

This means that ieee_80211_add_tagged_parameters() no longer needs to be
public; make it static.

Change-Id: I68e0592c3ea055c693d6d5d5a9eb88634ea37a95
Reviewed-on: https://code.wireshark.org/review/800
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-23 19:18:51 +00:00
Guy Harris 2a6e50ca7d Clean up white space.
This makes the code's if/then/else bracketing clearer.

Make the if/then/else style more consistent in one case, which also helps.

Change-Id: I7c765b761d92c6710461181b3e3ccd77d2a40f83
Reviewed-on: https://code.wireshark.org/review/799
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-23 18:45:07 +00:00
Alexis La Goutte 04c96553d6 DHCP/bootp: Always display by default value of Option 43 (Vendor-Specfic)
Change-Id: I91b711a11865ce8d31d3585b93b11923e25a12d3
Reviewed-on: https://code.wireshark.org/review/774
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-23 17:53:05 +00:00
Gerald Combs e0378dbf39 [Automatic manuf, services and enterprise-numbers update for 2014-03-23]
Change-Id: I33cecc1f3c4e66f5758eeb8cbba77cde97a06ae5
Reviewed-on: https://code.wireshark.org/review/793
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-23 15:12:41 +00:00
Guy Harris 045a662412 Note that the EAPOL-Key Key Data this dissects is for 802.11.
Change-Id: Id012c468da8619108ec41ad3ae43564f4fa636aa
Reviewed-on: https://code.wireshark.org/review/791
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-23 07:54:37 +00:00
Hadriel Kaplan 21a61a8cb1 Add Lua Struct.values() function, and prevent coercion in all Struct functions
This adds a Struct.values() function to get the number of values
needed/returned with Struct.pack/unpack. It also changes the existing
Struct functions such that they don't coerce a non-string argument
into a string. (not preventing it confused a user on ask.wireshark.org)

Change-Id: I93d5846105e55b67680e1c276a7286535c77b039
Reviewed-on: https://code.wireshark.org/review/790
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-23 07:05:30 +00:00
Hadriel Kaplan 1f28f472c8 Fix Bug 9915 'GIOP dissector prints non-UTF-8 to Info column'
When the capture file in Bug 9915 is opened in wireshark with GTK2,
the console prints out 'Pango-WARNING **: Invalid UTF-8' warnings.
This capture file was a subset of the one in fuzzbot crash bug 9883.
I believe it is what's causing the crash in 9883, because GTK is
finicky about such things. But my system doesn't crash for bug 9883,
so perhaps it's not the same root cause.

Change-Id: Ifaaed9157f9abd34014001c954647f7db51d650b
Reviewed-on: https://code.wireshark.org/review/786
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-22 14:48:51 +00:00
AndersBroman 4acdfe3e63 Fix request for implicit conversion from 'gpointer' to 'struct file_priv_t *' not permitted in C++
Change-Id: If88c65fa70d38d6b447a060a19d2681aa7166217
Reviewed-on: https://code.wireshark.org/review/783
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-22 10:36:22 +00:00
Hadriel Kaplan 66719c9b6a Add way for Lua file reader to save state per file read/write ops
Lua can create a file reader/writer, to open new capture file
formats or write to new ones. To save local state, it can save
things in Lua itself; but since there can be multiple open files
at the same time (for example during a reload), the Lua script
won't know for which file and state its read/write functions are
being invoked for. To remedy this, and also provide a convenient
way to store such state, this commit adds the ability for a Lua
script to store a Lua table in the wtap/wtap_dumper's priv
data member, just like C-code-based reader/writers do.

Change-Id: Ifc9e0d5f0379accee56f2a04b6080238670fec52
Reviewed-on: https://code.wireshark.org/review/766
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-22 08:06:47 +00:00
Hadriel Kaplan 296bc0b2a9 Fix Bug 9909 Buildbot crash correctly
Fixed a null de-reference in packet-ieee80211.c caused by change-id
I742726027bcab7d25ca4a9ce3a406518db6d272f, commit g4b8b83407ac744d114462235a8bcca0d480954c7.

See Bug 9909 for details.

Change-Id: I7189476faee3ae6ab34fb52c1564ac668496679a
Reviewed-on: https://code.wireshark.org/review/780
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-22 07:55:56 +00:00
Alexis La Goutte da83eadf5e Enhance Neighbor report
Closed-bug: 9724

Change-Id: Id6aefcddf5bd8bd490296e84351152808c03004a
Reviewed-on: https://code.wireshark.org/review/731
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-21 21:56:43 +00:00
Hadriel Kaplan 752e545fbf Fix API comments and don't use sprintf in wslua_int64.c
Change-Id: I4997317e010f685d47e1e2ab512b086e54b286a7
Reviewed-on: https://code.wireshark.org/review/777
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-21 19:49:27 +00:00
Martin Kaiser ad39bb3dea test for >0
Change-Id: I7114028ce296ffa875ddfbb24b935dc2573f964c
Reviewed-on: https://code.wireshark.org/review/770
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-21 18:48:50 +00:00
Martin Kaiser 95f5938e95 fix clear/scrambled detection
Change-Id: Id82763dd17e8c4e0902ae8e31ec6554e8f174b59
Reviewed-on: https://code.wireshark.org/review/769
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-21 18:48:14 +00:00
Hadriel Kaplan d1873dbcc8 Fix Bug 9903: 'Clicking reload-file ignores selected file format reader'
There's a relatively new feature in 1.11.3 to select a specific file format
reader, instead of relying on magics or heuristics. If you select a file
reader and open a file, open it, and then click the reload-file button or go
to View->Reload or press the ctrl-R keymap, the file is reloaded but using the
magic/heuristics again instead of the file format reader you previously chose.
Likewise, the Lua relaod() function has the same issue (which is how I found
this problem).

I have tested this change by hand, using a Lua script, but I didn't add it
to the testsuite because I need another change for my test script to work
correctly. (an enhancement rather than a bug fix, which I'll submit separately)

Change-Id: I48c2d9ea443e37fd9d41be43d6b6cd5a866d5b01
Reviewed-on: https://code.wireshark.org/review/764
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-21 17:51:45 +00:00
Alexis La Goutte 49be990fd3 Make Mac OS X buildbot happy (fix index shadow variable)
packet-epl.c:2248: warning: declaration of 'index' shadows a global declaration
packet-epl.c: In function 'dissect_epl_sdo_command_write_multiple_by_index':
packet-epl.c:2380: warning: declaration of 'index' shadows a global declaration
packet-epl.c: In function 'dissect_epl_sdo_command_read_by_index':
packet-epl.c:2489: warning: declaration of 'index' shadows a global declaration

Change-Id: Ib1a1d1d2aa596df558162839e7594b7fd12559a3
Reviewed-on: https://code.wireshark.org/review/765
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-21 15:31:08 +00:00
Andreas Leibold f5cfcf6e42 ieee1722a dissector added
Change-Id: I4361e282146d86057d6797bc001f6605d5d06486

Whitespaces removed, Code clean up, usage of expert information API

Change-Id: I4361e282146d86057d6797bc001f6605d5d06486

code beautyfying, modeline added

Change-Id: I4361e282146d86057d6797bc001f6605d5d06486

code beautyfying

Change-Id: I4361e282146d86057d6797bc001f6605d5d06486
Reviewed-on: https://code.wireshark.org/review/430
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-21 15:12:38 +00:00
Lukas Emersberger e0556fa47f EPL: Enable PLK to display OD entries
Each package is dissected using a reference to object indeces, so
  that in the view of the dissector output, a clear indication
  to what the index means and what the subindices mean is given.
  Additional special entries (mappings, timestamps) have their own hf
  fields, and can be searched for via display filter.

Signed-off-by: Lukas Emersberger <lukas.emersberger@gmail.com>
Change-Id: I928c11a9f4a5b762c8947713a0f70e03bd711158
Reviewed-on: https://code.wireshark.org/review/730
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Lukas Emersberger <lukas.emersberger@br-automation.co.at>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-21 14:39:31 +00:00
Hadriel Kaplan 25826ad433 Fix using '%hh' for printf format because MS Visual C++ is lame
Change-Id: I1d80b82d7c6a5aa85bf59b449326874c0f851737
Reviewed-on: https://code.wireshark.org/review/763
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-21 14:25:19 +00:00
Hadriel Kaplan dc758679d2 Fix missing license in conversation_debug.h
Change-Id: I5922a36ee84d45653e52e6fe847c6a9085ee5e21
Reviewed-on: https://code.wireshark.org/review/762
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-21 13:35:48 +00:00
Roland Knall 0940595a98 openSAFETY, EPL: Fix heuristic for false-positives
- Adding a typedefinition which can be deactivated, so
   that certain types of frames are only detected in their
   respective transport protocols
 - Rename bytes array as it is a key-word for some IDEs and
   hinders syntax checking
 - Add node info to the time request from/by fields
 - EPL: add message type to heuristic dissection call

Change-Id: Ia572bb68fc1d24d70e72b77867f0dad323b055b9
Reviewed-on: https://code.wireshark.org/review/750
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-21 05:17:05 +00:00
Hadriel Kaplan a04f610989 Add debug printing functions for conversations, sip, sdp, rtp
There have been enough gnarly bus in sip/sdp/rtp that it needs
to have good debug printing. Using a debugger isn't good enough
because there's interaction across multiple frames and it's too
hard to follow what's going on without real printed data history.

Change-Id: Ifb5bb1fb580be81f988569ece79d238a9c030c34
Reviewed-on: https://code.wireshark.org/review/688
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-21 05:15:57 +00:00
Hadriel Kaplan 9c5f199050 Fix bug 9909 Buildbot crash - but only to stop the crashing
This fixes the crashing on buildbot, but only in the sense that
it now calls DESSECTOR_ASSERT_NOT_REACHED() for the case that's
causing the crash - which is a null dereference, due to something
going wrong in add_tagged_field() of packet-ieee80211.c.

I don't know what the right thing to do is, but at least this
gets buildbot going again. (that file is over 25k lines!)

Change-Id: I1658944f9704a071dffc7f4834b9294fffc0e7ba
Reviewed-on: https://code.wireshark.org/review/757
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-21 04:58:15 +00:00
Guy Harris 7b6f0475f0 Handle big-endian Prism headers.
Apparently, some systems write out big-endian Prism headers (probably
big-endian-MIPS-based Wi-Fi APs running $LINUX_DISTRIBUTION and the
like), so check for both big-endian and little-endian message codes,
and, for the fields in the header, use the byte order that matched.

Change-Id: Ia13df606676bb7dbc5d12fe4e297681bebb6f478
Reviewed-on: https://code.wireshark.org/review/759
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-21 01:46:44 +00:00
Martin Kaiser 0ec20c3019 brackets around MAKE_TYPE_VAL's definition
Change-Id: I8e080b250b81976898d2950da9e91fb32b719590
Reviewed-on: https://code.wireshark.org/review/756
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-20 19:59:22 +00:00
Martin Kaiser 48f6b800ae (nearly empty) function to dissect the body of a track header box
Change-Id: I17e4bb3968e503b250b9c8d6a7a9bb2abf0f6868
Reviewed-on: https://code.wireshark.org/review/755
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-20 19:59:04 +00:00
Bill Meier 6553435985 col_...() should not be under 'if (tree)'; add editor modelines.
Change-Id: I4c2464c6faa79bdc1edb205f3f842864963d1cb9
Reviewed-on: https://code.wireshark.org/review/753
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-20 17:45:23 +00:00
Pascal Quantin 3626f860a6 Upgrade LTE RRC dissector to v11.7.0
Change-Id: If1f64241846cc18463c8c5e9da7dd2a5eaba6733
Reviewed-on: https://code.wireshark.org/review/752
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-20 15:41:44 +00:00
AndersBroman ffe7134b18 Get the NEXT protocol not the previous top one.
Change-Id: I261a740cbc369d905c89236b5173944e2780af59
Reviewed-on: https://code.wireshark.org/review/751
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-20 14:44:25 +00:00
Anders Broman 0513b29b8b Revert "Allow pcapng interface options to be available to dissectors."
This patch causes Wireshark/tshark to segfault if the file is reread(open a file and press reload).
The test suite also fails on 
2.1.1 Step: Exit status for existing file: "/home/wireshark/builders/trunk/sol10sparc/build/test/captures/dhcp.pcap" must be 0/home/wireshark/builders/trunk/sol10sparc/build/test/suite-clopts.sh: line 149:  6646 Segmentation Fault      (core dumped) $TSHARK -r "${CAPTURE_DIR}dhcp.pcap" > ./testout.txt 2>&1

OSX build bot chokes on
pcapng.c: In function 'pcapng_destroy_option_value':
pcapng.c:377: warning: implicit declaration of function 'g_byte_array_unref'
pcapng.c:379: warning: implicit declaration of function 'g_array_unref'
pcapng.c: In function 'pcapng_collect_block_option':
pcapng.c:419: warning: implicit declaration of function 'g_byte_array_new_take'
pcapng.c:419: warning: initialization makes pointer from integer without a cast

these functions are glib 2.22
This reverts commit 7b13a3b0f6.

Change-Id: Ia82fdb2d08287bc2cd2841e1e941ae68cbc2e009
Reviewed-on: https://code.wireshark.org/review/749
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-20 12:25:21 +00:00
Christopher Kilgour 7b13a3b0f6 Allow pcapng interface options to be available to dissectors.
Interface options[1], and more generally pcapng options[2], are useful
information that can provide improved dissector output.

Prior to this change, only certain pcapng interface options were interpreted
and made available to dissectors, e.g. the interface name or description.
This change augments the situation by providing epan_get_interface_option( ),
which returns an array of byte arrays if the option code exists
(otherwise NULL).  Each element of the array is a byte buffer containing
the raw data of the option.  An array-of-buffers is used because pcapng
allows for multiple instances of the same option to be present in the file.
All interface options found in a pcapng file are thus made available to the
dissector.

The implementation also provides infrastructure to collect options from
other pcapng blocks such as the section header.  Currently these options
are discarded, but could be retained in the future to support more features.

[1] http://www.winpcap.org/ntar/draft/PCAP-DumpFileFormat.html#sectionidb
[2] http://www.winpcap.org/ntar/draft/PCAP-DumpFileFormat.html#sectionopt

Change-Id: I944b6f0f03dde9b8e7d1348b76acde6f9d312f37
Reviewed-on: https://code.wireshark.org/review/331
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-20 09:54:01 +00:00
Michal Labedzki a68e3a410c Wiretap: Add support for Android Logcat
Now Androit Logcat (Logger) binary logs are supported.
Try "adb logcat -Bf /sdcard/log.logcat; adb pull /sdcard/log.logcat".
Also there is possibility to save logs to text format like by "adb".

Change-Id: If7bfc53d3fbd549a0978d1dbf96f3fff671fd601
Reviewed-on: https://code.wireshark.org/review/235
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-19 17:01:09 +00:00
ruengeler 27ad4c0331 Add a new case to find existing assocs when only the information of an INIT chunk is provided.
Change-Id: I88c5367652fb59a3da2cfd8895a1c0cc5176b859
Reviewed-on: https://code.wireshark.org/review/740
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Tested-by: Michael Tüxen <tuexen@wireshark.org>
2014-03-19 16:38:11 +00:00
Alexis La Goutte 830ad37ed6 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I303184523c22d17c3f642852bcd97a9533bf5521
Reviewed-on: https://code.wireshark.org/review/738
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 13:03:29 +00:00
Alexis La Goutte d35ccc5cdf Try to fix Mac OS X Buildbot
packet-ieee80211.c:8583: warning: integer constant is too large for 'long' type
packet-ieee80211.c:8584: warning: integer constant is too large for 'long' type
packet-ieee80211.c:8585: warning: integer constant is too large for 'long' type

Change-Id: I5badc6e0d2595d4353e33cd273d55f28737b34a8
Reviewed-on: https://code.wireshark.org/review/737
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 12:53:54 +00:00
Alexis La Goutte 8c3dee9bc9 Fix warning/error found by CheckAPI
(and fix also fix-encodings-args)

Change-Id: Ic2e99ca02398b7525b1cf68ab0d8279a2909940e
Reviewed-on: https://code.wireshark.org/review/736
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 12:53:43 +00:00
Peter Wu f7461a80fe USB: decode HID desc for unknown iface class
If the interface class is not yet known (for example, in the enumeration
phase; or if the interface descriptor was missed), then a HID descriptor
would not get dissected. Instead of printing an unhelpful "unknown
descriptor" message, always try to find a HID descriptor.

Change-Id: Ic162d6b93b0428a1edd3a925229093dfcc52c42d
Reviewed-on: https://code.wireshark.org/review/735
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 12:33:35 +00:00
Peter Wu 35c893421d USB: show data fragment for control messages
This makes the usb.data_fragment field more useful in tshark, i.e.,
showing the bytes for the data stage. Previously, the GUI would just
show the "Data Fragment" text label which is not really useful on its
own.

Change-Id: Id0ca39a9a144a37aa6d0b4ae65c1d655deb76748
Reviewed-on: https://code.wireshark.org/review/734
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 12:32:47 +00:00
Alexis La Goutte 7bbb3ac24d Try to make Mac OS X buildbot Happy
packet-ieee80211.c:8581: warning: implicit conversion shortens 64-bit value into a 32-bit value
packet-ieee80211.c:8582: warning: integer constant is too large for 'long' type
packet-ieee80211.c:8583: warning: integer constant is too large for 'long' type
packet-ieee80211.c:8583: warning: implicit conversion shortens 64-bit value into a 32-bit value
packet-ieee80211.c:8584: warning: integer constant is too large for 'long' type
packet-ieee80211.c:8584: warning: implicit conversion shortens 64-bit value into a 32-bit value

Change-Id: I8f8c5518239c7d6e55006abfca8d9452f9a09c6a
Reviewed-on: https://code.wireshark.org/review/733
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 11:50:48 +00:00
Alexis La Goutte 3d6c13e48b Fix build
wslua_file.c:92:13: error: request for implicit conversion from 'WFILE_T' to 'FILE_T' not permitted in C++ [-Werror=c++-compat]

Change-Id: Iff9cc716333802a3902429a8c68e5f4cdac2ee9e
Reviewed-on: https://code.wireshark.org/review/732
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 11:24:40 +00:00
Moraney Jalil 4b8b83407a Support for IEEE 802.11ad
(according to the 9th draft of the standard)

Closed-bug: 8594

Change-Id: I742726027bcab7d25ca4a9ce3a406518db6d272f
Reviewed-on: https://code.wireshark.org/review/632
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 11:18:33 +00:00
AndersBroman bbd18804ef Fix Error: the name for hf_lg8979_start_ptnum8 ("lg8979.start_ptnum8") has
trailing space in packet-lg8979.c

Change-Id: I80e5c93846c66aad1d1bc6f91b20501e0f384a6c
Reviewed-on: https://code.wireshark.org/review/729
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-19 06:26:03 +00:00
Pascal Quantin 488f2a0974 Exported PDU: add support for data length on the wire
Change-Id: Iff14ec4d0297ec85f3597b33871fb0ab5256a597
Reviewed-on: https://code.wireshark.org/review/728
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-19 05:13:30 +00:00
Hadriel Kaplan 30ba425e7e Fix Bug 9885: 'Buildbot crash output: fuzz-2014-03-14-15333.pcap'
The Buildbot found a crash which is cause by a bug that has
been there all along, but a recent change exposed. This bug is
likely in 1.10.6 as well, so I'll backport this if I can
reproduce it in 1.10.6.

Change-Id: I505bc73cbe6281e6d64f00de441c8e6231b55000
Reviewed-on: https://code.wireshark.org/review/702
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-19 05:09:12 +00:00
cbontje fff998d6c1 New Dissector for Landis & Gyr (Telegyr) 8979
Commit includes dissector code for lg8979 as well as additions to RTAC Serial code to call dissector when required.

See bug report 9874 for further details and sample pcap files

UPDATE1: L&G 8979 commit for addressing comments from Anders and Alexis and added Cmakelists.txt
UPDATE2: address further comments from Alexis re. proto_item_set_text / proto_item_add_text entries.  Also add modelines
UPDATE3: fix compilation error noted by Alexis
UPDATE4: address proto_tree_add_* comments from Michael

Change-Id: I6e69d2b7b7e91e6efa12e4a5fb7dbd140c0540ed
Reviewed-on: https://code.wireshark.org/review/610
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-19 05:07:34 +00:00
Michael Mann 04d9501306 Add capture file reader/writer support for Lua so scripts can implement new capture file formats.
This enables a Lua script to implement a brand new capture file format reader/writer, so that for example one could write a script to read from vendor-specific "logs" of packets, and show them as normal packets in wireshark.

Change-Id: Id394edfffa94529f39789844c382b7ab6cc2d814
Reviewed-on: https://code.wireshark.org/review/431
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-19 05:04:54 +00:00
Pascal Quantin d832cb18db Fix OS-X compilation broken by gc354675
Change-Id: Ie32a2c256055059d1eade29af69eaad9011ca78b
Reviewed-on: https://code.wireshark.org/review/727
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-18 17:28:07 +00:00
AndersBroman c354675c41 Dechunk/export sctp payloads trough export PDU.
Change-Id: I86d21cadcbd3e85b7a91d509ffd3c317d76a2ce2
Reviewed-on: https://code.wireshark.org/review/726
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-18 17:08:50 +00:00
Pascal Quantin d416783bc6 ULP: upgrade dissector to approved version 2.0.1
Change-Id: I9d7b16c450cb99aa1d66b0a180241c36f8869637
Reviewed-on: https://code.wireshark.org/review/716
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-17 17:25:43 +00:00
Bill Meier b7492919ab Revert "Try to make the heuristic a bit more efficient."
(based upon an OK from Anders).

(The commit caused 'reload_framing_info' to be referenced before being set).

This reverts commit b3ce4ecc14.
    svn path=/trunk/; revision=52004

Change-Id: If715e1cad041fd832f460411cc652d9b5764d069
Reviewed-on: https://code.wireshark.org/review/718
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-17 17:04:52 +00:00
Bill Meier 386ebf50fe Heuristics length check must use captured_length; Do other misc changes:
- Use tvb_reported_length() iso tvb_length() in various places;
- Add some 'if(tree) {...}';
- Remove an unneeded length-check;
- Use a consistent formatting style for hf[]array entries;
- Do some minor whitespace changes;
- Add editor modelines.

Change-Id: Iac0a74142c5a5944e69fc911e54b0fbdfd1f5bab
Reviewed-on: https://code.wireshark.org/review/717
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-17 16:45:58 +00:00
AndersBroman ce527ba58d Try to fix trivial varnings
Change-Id: I7b09999fe34ffded73f0b26c3e561b39d2120643
Reviewed-on: https://code.wireshark.org/review/714
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17 15:57:55 +00:00
AndersBroman aea1edfe0d Mark tree as unused.
Change-Id: I57c201c0077144aace68bb51a6b0c7350dd8d5a8
Reviewed-on: https://code.wireshark.org/review/713
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17 15:27:53 +00:00
AndersBroman e839a4abb9 Inhance summary output for some 3GPP AVPs
Change-Id: I3657cef87070b91ae17a438140f1fb77edae8622
Reviewed-on: https://code.wireshark.org/review/709
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17 15:08:59 +00:00
Alexis La Goutte 66d0b1893a Fix some typo on 802.11 dissector
(Found by Jalil Moraney in change to add 802.11ad support review 632)

Change-Id: I547bf647ae7400633ad27c7849088fd088928075
Reviewed-on: https://code.wireshark.org/review/708
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17 12:57:57 +00:00
Marko Hrastovec 3b69de702e Asterix CAT062 fix. Units for cartesian velocity of track were displayed with wrong units.
Change-Id: I716dfeb16b049544e691dcdf75c488758d9e1fa0
Reviewed-on: https://code.wireshark.org/review/707
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-17 09:59:19 +00:00
Alexis La Goutte 2507ce4cb3 Revert de6bfa12b0 (break Linux and Mac OS X buildbot...)
Change-Id: If5a6a77909b2d178052605cf2fc6fc0ef758553c
Reviewed-on: https://code.wireshark.org/review/706
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-17 09:42:19 +00:00
Alexis La Goutte de6bfa12b0 Fix build on my old Windows XP Buildbot (With VS2008EE)
../../asn1/atn-ulcs/packet-atn-ulcs-template.c(126) : fatal error C1083: Cannot
open include file: 'stdint.h': No such file or directory

Change-Id: I8825a2f0b6440ec5a4bbfb49ea5c183dd8cbf03f
Reviewed-on: https://code.wireshark.org/review/705
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17 08:23:04 +00:00
AndersBroman fcf1c44b50 Make the avp_str available to sub dissectors and Let the subdissector have
precedence filling in the avp_item string. Use that in a couple of places.

Change-Id: I1af7a1ca4c14fb56ddeaab336202e6c2a18e556b
Reviewed-on: https://code.wireshark.org/review/699
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-16 19:15:54 +00:00
Michael Mann d8265cd8c6 Remove Visual Studio solution and project files (and their existence from Makefiles)
There have been discussions on -dev about removing this and I believe I was the last holdout. Finally convinced that I should just have a local copy (ignored by git)

Change-Id: Ic72a22baf58e3412023cf851f0fce16eb07113b0
Reviewed-on: https://code.wireshark.org/review/681
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-16 18:03:41 +00:00
Ronnie Sahlberg 51f26ab49a NFS: We need to pass data through to the dissect_rpc_list() callback
Change-Id: Iace7c6dfb81f0a98bbae304346906a5e82c82812
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Reviewed-on: https://code.wireshark.org/review/679
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-16 18:01:19 +00:00
Gerald Combs 5569f66084 [Automatic manuf, services and enterprise-numbers update for 2014-03-16]
Change-Id: I714e82b9ea319c2937460978f6feb119917f56f9
Reviewed-on: https://code.wireshark.org/review/696
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-16 16:12:22 +00:00
Joerg Mayer b0b6064542 Fix
[  5%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-umts_fp.c.o
/home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c: In function ‘umts_fp_init_protocol’:
/home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4526:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat]
                 umts_fp_conversation_info->iface_type        = uat_umts_fp_ep_and_ch_records[i].interface_type;
                 ^
/home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4527:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat]
                 umts_fp_conversation_info->division          = uat_umts_fp_ep_and_ch_records[i].division;
                 ^
/home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4533:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat]
                 umts_fp_conversation_info->rlc_mode          = uat_umts_fp_ep_and_ch_records[i].rlc_mode;
                 ^
cc1: all warnings being treated as errors

Change-Id: Ie783a261c40d26ffd105822d5f45bd0513aa1914
Reviewed-on: https://code.wireshark.org/review/693
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-03-16 08:43:52 +00:00
Guy Harris 4342323c08 Support to version 3.0 of netscaler packet wire format.
From shekhar.chandra@citrix.com.  See bug 9280.

Change-Id: If3abbc653bb1f127b151976d4183af4c4f1e71eb
Reviewed-on: https://code.wireshark.org/review/658
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-16 03:04:13 +00:00
AndersBroman f1996885d2 Add an UAT table to define endpoints and channel data to be able to
presetup conversations with FP dissection data.

Change-Id: Ibced63bf944d7268751f8055095eb26477664be1
Reviewed-on: https://code.wireshark.org/review/643
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-16 02:50:25 +00:00
Bill Meier 42c522ccf2 (Minor) prefs_register_protocol() callback not required; Therefore: simplify proto_reg_handoff...().
Change-Id: Ic09351d7b04d55814211618056e92430bc114f6f
Reviewed-on: https://code.wireshark.org/review/684
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-15 18:01:09 +00:00
Bill Meier 7b6b6e5aaa Add a length-check to heuristic to prevent any exception during test; add editor modelines.
Change-Id: I8b4f565699c4d044cc3b64b22115a921b97b3d38
Reviewed-on: https://code.wireshark.org/review/683
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-15 18:00:39 +00:00
Bill Meier 33b3bb9b8a (Trivial): add editor modelines. use consistent indentation & do whirespace re-formatting.
Change-Id: Ic8378bf398bcabfe1f50f7f6ccbe10e2e84884d5
Reviewed-on: https://code.wireshark.org/review/682
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-15 18:00:10 +00:00
Pascal Quantin d6548f9301 Remove unused const variables errors seen with recent Clang version
Fixes bug 9886

Change-Id: I8624ef1c5874aea5521d21c998510fc29c838936
Reviewed-on: https://code.wireshark.org/review/657
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-15 17:52:16 +00:00
Bill Meier 830684fc0d #if 0 (with XXX comment) use of try_conversion(); Also: do misc cosmetic changes.
Change-Id: Ib31439cfaaf5c08113b87f0bbb0b75932ca06bc9
Reviewed-on: https://code.wireshark.org/review/680
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-15 15:53:58 +00:00
Alexis La Goutte 0d2dd00564 Fix -Wabsolute-value in ICMP dissector (found by Clang 3.5)
packet-icmp.c:1245:7: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value]
packet-icmp.c:1245:7: note: remove the call to 'abs' since unsigned values cannot be negative
packet-icmp.c:1245:30: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value]
packet-icmp.c:1245:30: note: remove the call to 'abs' since unsigned values cannot be negative
packet-icmp.c:1254:6: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value]
packet-icmp.c:1254:6: note: remove the call to 'abs' since unsigned values cannot be negative
packet-icmp.c:1254:29: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value]
packet-icmp.c:1254:29: note: remove the call to 'abs' since unsigned values cannot be negative
packet-icmp.c:1623:7: error: taking the absolute value of unsigned type 'guint32' (aka 'unsigned int') has no effect [-Werror,-Wabsolute-value]
packet-icmp.c:1623:7: note: remove the call to 'abs' since unsigned values cannot be negative
packet-icmp.c:1629:7: error: taking the absolute value of unsigned type 'guint32' (aka 'unsigned int') has no effect [-Werror,-Wabsolute-value]
packet-icmp.c:1629:7: note: remove the call to 'abs' since unsigned values cannot be negative

Change-Id: I6b344d01b8239fb93aedf95d954ef1243ba45a6b
Reviewed-on: https://code.wireshark.org/review/673
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-15 11:38:21 +00:00
Alexis La Goutte 5d2409116e Fix indent (use 2 spaces)
Change-Id: If7872c510d20e9f04e44e3fdf09c023e5ac602d9
Reviewed-on: https://code.wireshark.org/review/648
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-15 09:02:56 +00:00
Pascal Quantin e63eb0298a Fix compilation of packet-aruba-erm.c
Change-Id: I30bef3eb92e1bdf67e4a3019ef3542e14ac9505c
Reviewed-on: https://code.wireshark.org/review/669
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-15 09:01:12 +00:00
Alexis La Goutte a16b86282c Enhance dissector Aruba ERM
Support type 0 (legacy), type 1 (peek), type 3 (pcap+radio) mode
via preference

type 2 (airmagnet) is no yet supported

Change-Id: I4f0d10e5d9b87bdcf5863d84e565201acaeee45b
Reviewed-on: https://code.wireshark.org/review/647
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-15 08:21:24 +00:00
Hadriel Kaplan bac9b5b6fd Fix lrexlib.c clang static analyzer warning
This fixes a "Argument with 'nonnull' attribute passed null" warning
generated by the clang static analyzer.  It's a false positive, but
easy to remedy.

Change-Id: Id737d1ac29765ed26a416c5cd13bedafee478fb6
Reviewed-on: https://code.wireshark.org/review/661
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-15 08:19:33 +00:00
Guy Harris 55f6b2e048 Remove more now-unused stuff.
Change-Id: I8f65ed38e0b5f8923b7c273c2fca4c2b57c5af9c
Reviewed-on: https://code.wireshark.org/review/659
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-14 19:53:03 +00:00