Commit Graph

52796 Commits

Author SHA1 Message Date
Anish Bhatt a915de5295 Fix build failures caused by lldp cleanup
Change-Id: I4d4aeb71720f02e4a6f4a8e5f803fd63dc7aed81
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1524
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06 07:58:36 +00:00
AndersBroman da00889226 Add a cast to make MSVC happy.
Change-Id: Iee901ae56c796007821c1754056c61954e8a342f
Reviewed-on: https://code.wireshark.org/review/1526
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06 07:57:21 +00:00
AndersBroman 72662c22c2 Try to fix
packet-mysql.c(1446) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data

Change-Id: Ie0b2e916e0d15287f5a3ededc404b678b45600d8
Reviewed-on: https://code.wireshark.org/review/1525
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06 07:49:34 +00:00
Jess Balint a4a851cb80 MySQL protocol dissector: Add support for sessiontracking in MySQL 5.7.4. Bug 9948.
Change-Id: Ia451bfff571c4da280ccf76b1d5ac9dfcfead78c
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/916
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06 06:55:10 +00:00
Jakub Zawadzki ecc6b8d620 Move common part of col_append_fstr, col_append_sep_fstr to seperate fnction.
From the comments I think it was intended - but there were no G_VA_COPY macro in glib (?).

Change-Id: Ic1e1d4a5ac9e5b8f27f25487416c0ededeed2093
Reviewed-on: https://code.wireshark.org/review/1518
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06 06:49:18 +00:00
Anish Bhatt 209f82a501 Cleanup LLDP dissection, convert add_text to tree items.
Just started on this, more changes incoming

Change-Id: Idc88442f382cea1f29f05edb991b920488cfc113
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1502
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06 06:48:07 +00:00
Jakub Zawadzki be3a153707 tcp: move & optimize printing tcp flags to seperate routine.
The formatting routine is quite simple so it can be replaced with
g_stpcpy() and still keeping it clean.

Change-Id: Ifbab1dc1140ee271d39bbbfb7586cfda6ded5c54
Reviewed-on: https://code.wireshark.org/review/1517
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-06 06:41:48 +00:00
Evan Huus f764765108 Increase the work used to time wmem allocators
It appears that on some platforms the timer underlying g_test_timer() is
relatively low-precision, so the small amount of work that we were previously
doing was not enough for the timer to provide a useful value.

Bumping the amount of work should provide more meaningful values, and the whole
timing step still takes only a few seconds.

Change-Id: Idce1386eaa33add845d9a2758b0beb72bbf370d6
Reviewed-on: https://code.wireshark.org/review/1523
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-06 02:30:05 +00:00
Pascal Quantin 542b4e6742 MAC/RLC/PDCP LTE: replace obsolete APIs
Change-Id: I5368cc7b1986c6a87cb70a3fd3cb5e589d73f870
Reviewed-on: https://code.wireshark.org/review/1520
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-05 21:26:46 +00:00
Sean O. Stalley eecc1353a2 Added parentheses to macros to prevent unexpected behavior
Masks for padding now have an additional parenthesis to ensure
proper operator precedence.

Per the request of Evan Huus; See comment in Change-Id:
I3ad4e1beb891f9c2835adff320095e7e738241eb, Patch Set 10.

Change-Id: Ic8878f870b58cd272675b4d6c3658a029bb67984
Reviewed-on: https://code.wireshark.org/review/1519
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-05 20:46:36 +00:00
Guy Harris 2975593227 libnl is a Linux-specific library; don't offer libnl support except on Linux.
Change-Id: I79a98d1f9b3559fe76feed1038d673dd3424409c
Reviewed-on: https://code.wireshark.org/review/1515
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-05 18:23:10 +00:00
Alexis La Goutte e35ccbac90 Add RFC6463 (Runtime Local Mobility Anchor (LMA) Assignment Support
for Proxy Mobile IPv6) MIP6 Mobile Option

Change-Id: I650cb33fcf083bd8826a702cb975295518012292
Reviewed-on: https://code.wireshark.org/review/1511
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05 17:12:34 +00:00
Alexis La Goutte 2aa66aa2b2 SSH Dissector : Remove ssh_proto_tree_add_item (No longer needed)
Change-Id: I6d227ad7a4ddfab9d2cf18a3148700a6bd6dd321
Reviewed-on: https://code.wireshark.org/review/1512
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-05 16:57:17 +00:00
AndersBroman 09a9c86473 Add the possibillity to add a string to the termination id.
Change-Id: I3b48b28273a8c1a1558045d2a4ab5104160840de
Reviewed-on: https://code.wireshark.org/review/1510
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05 15:51:18 +00:00
Evan Huus 326202f016 Solaris doesn't like anonymous unions
so give it a name

Change-Id: Iaf9a6f8cb58a565673f53696f7e5d1698e6eae0f
Reviewed-on: https://code.wireshark.org/review/1509
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05 15:26:15 +00:00
Alexis La Goutte 33586a09d4 OpenFlow 1.4 OXM field OXM_OF_IPV6_ND_SLL incorrectly dissected (128 bits read instead of 48)
Dissection of OXM_OF_IPV6_ND_SLL triggers "malformed packet" comment in packet list since it makes dissecting of further OXM fields impossible.

It is possible that similar issue will be with OXM_OF_IPV6_ND_TLL since its dissecting is basically the same.

Issue found by Viktor
Closed-bug:10011

Change-Id: I21b85cc0572ffdb8bb8b73cfae0db1d72219fe4b
Reviewed-on: https://code.wireshark.org/review/1505
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05 15:26:13 +00:00
Alexis La Goutte ce282a7345 OpenFlow 1.3 OXM field OXM_OF_IPV6_ND_SLL incorrectly dissected (128 bits read instead of 48)
Dissection of OXM_OF_IPV6_ND_SLL triggers "malformed packet" comment in packet list since it makes dissecting of further OXM fields impossible.

It is possible that similar issue will be with OXM_OF_IPV6_ND_TLL since its dissecting is basically the same.

Issue found by Viktor
Closed-bug:10011

Change-Id: I13893710ad4028669e454c6f8485f719b62bcaab
Reviewed-on: https://code.wireshark.org/review/1504
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05 15:25:49 +00:00
Evan Huus 0523c2d0d7 Fix build with older compilers
The struct literal syntax {0} does not appear to be universally supported - use
memset instead.

Change-Id: If70d475cf3d7a582c43dcc879cefebc9aef0a99e
Reviewed-on: https://code.wireshark.org/review/1508
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05 14:50:09 +00:00
Jan Seda a1ddde9600 SSH dissector: fix MAC length calculation for recent OpenSSH features
Also, show the packet length part of the encrypted packet.  The length may
be encrypted (typical) or not (-etm modes and GCM mode). When not
encrypted, show as a number.

Bug:10066
Change-Id: I8c3a943b1b527b326b662e71f07ac6157684d5d9
Reviewed-on: https://code.wireshark.org/review/1462
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05 13:52:05 +00:00
Sean O. Stalley ac99cfd0d2 Media Agnostic USB Packet Dissector
This dissector dissects MA USB Packets. It is capable of dissecting
Media Agnostic packets both in a TCP stream as well as packets sent
over SNAP (referred to in spec as "Raw Ethernet" mode).

Change-Id: I3ad4e1beb891f9c2835adff320095e7e738241eb
Signed-off-by: Sean O. Stalley <sean.stalley@intel.com>
Reviewed-on: https://code.wireshark.org/review/1252
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05 13:49:56 +00:00
Evan Huus 93619389ea Fix dead assignment found by clang in test code
Change-Id: Ie78769bfd8034f6c2ee7d9e26a209d650cedb98d
Reviewed-on: https://code.wireshark.org/review/1507
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-05 13:08:44 +00:00
Alexis La Goutte a0b76c994c Allow IPv6 Mobility Option Service Selection with option length = 1
According to RFC 5149 (http://tools.ietf.org/html/rfc5149#section-3), the Service Selection mobility option length must be between 1 and 255.

Discovered while working on Pcap.Net, http://pcapdot.net.
Found by Boaz

Change-Id: I6d9e9eba8c45b5a6c38523182069ab0f236d85bb
Closed-bug:10045
Reviewed-on: https://code.wireshark.org/review/1506
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-05 12:52:05 +00:00
Evan Huus 402bbcbd05 Reduce wmem fast-block fuzz rounds even further
Follow-up to g19e650f43adf23b0aa92821bff0cc389643944f6 since the fuzz-bot is
still failing.

Change-Id: I2d05a861b0edf50ce734b682e6e3e33729bf6771
Reviewed-on: https://code.wireshark.org/review/1503
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05 11:32:19 +00:00
Alexis La Goutte 491a321c37 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I35ed4c0ecc28dee57d7a4cac8ddbf43d16b39677
Reviewed-on: https://code.wireshark.org/review/1501
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05 11:19:42 +00:00
Alexis La Goutte 56b8c9e294 Fix indent (use tab) and modelines
Change-Id: Ibff9e0564f2786e8a51b8884724c322725fdf147
Reviewed-on: https://code.wireshark.org/review/1500
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05 11:18:34 +00:00
Evan Huus 16dfe11b24 Several tweaks to fast block allocator
- manually inline wmem_block_fast_add_to_block_list, it was only two lines and
  only called twice, so the function boilerplate was outweighing the abstraction

- change free_all to release all but one block to the OS immediately, making gc
  a no-op; the alloc logic doesn't reuse later blocks anyways, so this was
  effectively a leak

Change-Id: I033fbb2f3d87e58c7346cba10f2c710eaaa49e9f
Reviewed-on: https://code.wireshark.org/review/1499
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05 06:05:18 +00:00
Michael Mann bf3fbb394f Add dissector for 3GPP2 A21/S102 protocol.
Change-Id: I611c217e1eec47da7427c0317ed9416b4c52411a
Reviewed-on: https://code.wireshark.org/review/1487
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05 04:28:57 +00:00
Jakub Zawadzki 984e52244f Fix possible buffer overflow in col_append_sep_fstr()
After appending separator it might happen that len > max_len, in such case
g_vsnprintf() will overflow the col_buf buffer.

Change-Id: Ic5ff49d30e30509e835165c4cc7e72e31f92fd5f
Reviewed-on: https://code.wireshark.org/review/1493
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05 03:58:42 +00:00
Jakub Zawadzki f13bbf2707 Fast block allocator: make wmem_block_fast_hdr_t single linked list.
Double linked list was required by jumbo allocation.
No support for jumbo -> no need for double linked list -> have only 'next' pointer in header.

Change-Id: I48a0f468ebba9db3a63548d8e7307b6424c759ed
Reviewed-on: https://code.wireshark.org/review/1495
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-05 03:57:51 +00:00
Guy Harris 8f2f727571 Not finding a non-required package is *NOT* an error!
If you think not finding a package that the user specifies should be
used should be an error, please fix bug 10074 first - not finding a
package that the user *didn't* specify should be used or shouldn't be
used should not be an error.

Change-Id: I62aba4309e227352e114f2d291aaa74dba78840f
Reviewed-on: https://code.wireshark.org/review/1498
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-05 03:12:14 +00:00
Guy Harris 0b0c98a040 set(<variable>) *undefines* the variable; a value must be specified.
When setting the XXX_REQUIRED variables, set them to TRUE.

Change-Id: I1591ffe221e15d65cb64516a45e9dc8461051373
Reviewed-on: https://code.wireshark.org/review/1497
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-05 03:07:21 +00:00
Evan Huus 19e650f43a Fuzz fewer iterations of the fast block allocator
I believe the XP buildbot failures are simply running out of memory, so
hopefully reducing the number of iterations should be enough to let it finish
reliably.

Change-Id: I40af789d528c2623e95f153529205b5e617c6e02
Reviewed-on: https://code.wireshark.org/review/1496
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-04 22:24:44 +00:00
Pascal Quantin 6c7ab457ea MAC LTE: fix compilation error
error: assignment discards 'const' qualifier from pointer target type [-Werror]

also add the missing definition of hf_mac_lte_bsr_size_median

Change-Id: I31e172a16b4afd59ba8cf5a9b281bbeaf15b6c56
Reviewed-on: https://code.wireshark.org/review/1492
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-04 21:08:31 +00:00
AndersBroman 1d1730fc56 Update some soft-deprecated APIs.
Change-Id: I0e255e72dd4cd9a94a4f92af409c4b34c0a266ed
Reviewed-on: https://code.wireshark.org/review/1491
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-04 19:23:05 +00:00
Gerald Combs e7a51d75ee [Automatic manuf, services and enterprise-numbers update for 2014-05-04]
Change-Id: Idd150c8d2a7f4e5368ca80c35ae920fb40944f1d
Reviewed-on: https://code.wireshark.org/review/1488
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-04 15:04:33 +00:00
David Ameiss bdfe17f12e GUI modules for LBM aka 29West dissectors.
bug:9718
Change-Id: I05330d8a2475ad0d238723d444f3d98bdbd7be39
Reviewed-on: https://code.wireshark.org/review/1041
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-04 02:55:45 +00:00
Michael Mann 9606ec5954 Remove enabling HAVE_SNOW3G by default
Change-Id: Ie1af436b763ec762a41af0bdfc1f3ec6adea2bc1
Reviewed-on: https://code.wireshark.org/review/1486
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-04 01:13:07 +00:00
Martin Mathieson 1ddce8bb4c Have RRC tell MAC about RAPID ranges so it can show for RAPIDs seen
Change-Id: Ie9adbe3015c63e53997068053b6f8ec224a5bf82
Reviewed-on: https://code.wireshark.org/review/1474
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-03 21:39:20 +00:00
Martin Mathieson 32e3e410ae Update TODO comments
Change-Id: I4ea940be5b65c041bdd330bfc2bdbe9a00360d00
Reviewed-on: https://code.wireshark.org/review/1475
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-03 21:38:36 +00:00
Alexis La Goutte a394d448f4 LLDP: Remove packet-lldp.h
Change-Id: If6d1fd1b7961f975447db43f616e016f70ca5cb8
Reviewed-on: https://code.wireshark.org/review/1473
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-02 21:36:07 +00:00
Alexis La Goutte 59a4a856a3 ECP dissector Remove packet-lldp.h depends
* Fix indent (use tabs)
* Use VDP function for end VTPDU

Change-Id: I93216ac5b304dc3ba78cbe830e5d12589c138eb5
Reviewed-on: https://code.wireshark.org/review/1472
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-02 21:35:20 +00:00
Alexis La Goutte b7d6055f2e Move value string of LLDP OUI to epan/oui.h
Change-Id: I3d9ddbae60631c958880574e7e441a931db3492d
Reviewed-on: https://code.wireshark.org/review/1471
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-02 21:34:17 +00:00
Jakub Zawadzki 5f239013e7 wmem: add new simple block allocator, use it in packet-scope.
For packet-scope allocation, there's no need to support realloc(), free()
cause memory will be garbage collected after packet dissection.

(and this allocator is much faster than full block allocator).

Change-Id: I73fdf708c3077f48f55bdcc71f4fa859e4ac2335
Reviewed-on: https://code.wireshark.org/review/1428
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02 21:07:07 +00:00
Alexis La Goutte fa84054dc7 Enhance display of SPDY packet (Remove some information from column)
Fix also tvb_length / tvb_length_remaining soft warning

Change-Id: I3fd8f3a842fa84273b84ae36317e2c3fbdca076d
Reviewed-on: https://code.wireshark.org/review/1461
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02 14:43:40 +00:00
Alexis La Goutte 13e8983dbf Add modelines info
Change-Id: I35bed12af5e0a2da9daf2fb5b6dfdfe05377549e
Reviewed-on: https://code.wireshark.org/review/1470
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02 14:41:37 +00:00
Alexis La Goutte c27ad662f2 Add modelines info
Change-Id: I82f841e0ee9e00c69894d8c4c67f581278c87546
Reviewed-on: https://code.wireshark.org/review/1469
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02 14:40:47 +00:00
Evan Huus abc387934b Reintroduce wmem_allocator_force_new
We now have to call wmem_init in order to randomly seed the values for wmem_map.
This means we can no longer rely on the lack of override, so we have to force
the right allocator type when testing/timing the allocators themselves.

Change-Id: I005034465b0a98f19876899b96ef65b3e4b1d759
Reviewed-on: https://code.wireshark.org/review/1468
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02 14:37:53 +00:00
Evan Huus f181756640 Optimize wmem_strbuf_grow.
As suggested by Anders, in the case of repeated calls to wmem_strbuf_append_c
(and other functions which append very little data) the growth check was a
substantial portion of the over-all running time. By short-circuiting the check
in the case where growth isn't needed (as opposed to letting it fall-through
naturally) we shave ~25% off the cost of such repeated calls in my benchmarks.

The function (wmem_strbuf_grow) is inline, so the compiler should be able to
optimize each caller individually for the short-circuit.

Change-Id: I76419020f4d8fa675906eb77798969b6c61c7732
Reviewed-on: https://code.wireshark.org/review/1467
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02 14:34:50 +00:00
Marcel Essig 34fa169719 Add a new Dissector for HiSLIP
Change-Id: I87aaf4c8093ee8013a661aa8af81dba63eaa7086
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/1337
2014-05-02 13:39:42 +00:00
Alexis La Goutte 2b2d8a963b Fix Dereference of null pointer found by Clang analyzer
Also add modeline info and use _U_ only when it is needed (for pinfo)

Change-Id: I71349d6451e1d8304fad04781e5ee226a1a4c729
Reviewed-on: https://code.wireshark.org/review/1466
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02 13:12:08 +00:00