Commit Graph

55200 Commits

Author SHA1 Message Date
Bill Meier bfe3706035 Always put editor-modelines at the end of the file ...
... to ensure that there are no potential issues with respect to
editors limiting the number of lines scanned at the end of the file
when checking for editor modelines.

Change-Id: Ic85cbb108bb5159d6ec4116fea11f5eebb4e44a4
Reviewed-on: https://code.wireshark.org/review/4688
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 20:08:29 +00:00
Bill Meier 71c5ac03e2 packet-assa_r3.c: Use editor modelines from http://www.wireshark.org/tools/modelines.html
Change-Id: I2d9accd2336448ced30dca1878a3e27cdba29566
Reviewed-on: https://code.wireshark.org/review/4687
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 20:07:51 +00:00
Nick Carter 0ce5b8cdac Add RakNet protocol dissector
Bug: 10534
Change-Id: Id56008da0c21a5f3a0309cdf21aff287c7820dcf
Reviewed-on: https://code.wireshark.org/review/4372
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-14 19:38:17 +00:00
Guy Harris 74a8ad74c5 Get rid of no-longer-used #define.
Change-Id: Ibaebda819094f09610dc9cf8a303440b93bf2da0
Reviewed-on: https://code.wireshark.org/review/4686
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-14 19:32:17 +00:00
Guy Harris a18c9c5cf0 Don't supply time stamps for Capsa packets for now.
The time stamps aren't known to be right, so don't provide them - that
way, instead of users reading Capsa files and getting the wrong idea
about the time stamps, they'll get no time stamps and have to ask for
our help, at which point we can ask them for *their* help in seeing what
Capsa thinks the time stamps are.  (The joys of reverse-engineering.)

Change-Id: I77e12c09f2bc74b50a1b2b226fa6da3e8c0fedf9
Reviewed-on: https://code.wireshark.org/review/4685
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-14 19:30:32 +00:00
Bill Meier 87ea03bf37 packet-gvsp.c: removed an unused #define
Change-Id: If330124cdc459867b33e1bbbe960c969deb85b10
Reviewed-on: https://code.wireshark.org/review/4684
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 16:56:25 +00:00
Bill Meier 10b83e6931 Add editor-modelines; adjust whitespace.
Change-Id: I8cad872cee972a6d22a72852dac57fd188daca84
Reviewed-on: https://code.wireshark.org/review/4683
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 16:45:09 +00:00
AndersBroman 2359e67f9c GTPv2 Dissect more bits in IE Indication.
Change-Id: I19d0b67e06ec22bfc5bafc58fdeb445e30e25f95
Reviewed-on: https://code.wireshark.org/review/4682
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-14 13:59:33 +00:00
Stig Bjørlykke 3ec9ddc14e PIM: Disable unused pimbdirdfvals.
Change-Id: I2b023868d9f84e891e36f2cfcfd4ad25e1e43592
Reviewed-on: https://code.wireshark.org/review/4681
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-14 13:59:18 +00:00
AndersBroman 0e2f12810c Add new Event-Trigger values.
Change-Id: Idd18a710fd8630d5b50c5ac180d7aa45a40596d7
Reviewed-on: https://code.wireshark.org/review/4680
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-14 08:56:51 +00:00
Guy Harris 0cbaae4530 Fix return values.
Change-Id: I3f11d48f74d71367cc76c76dfc88763894f23f2c
Reviewed-on: https://code.wireshark.org/review/4679
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-14 08:48:47 +00:00
Bill Meier 9cba3b6eb6 packet-gvsp.c: sort pixeltypenames[] for extended value-string use.
Change-Id: Iaf753d432603422922ad7ef4ba7a2c2b3cd84136
Reviewed-on: https://code.wireshark.org/review/4678
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 07:35:52 +00:00
Guy Harris e70db8e7eb And another warning.
(So why can't GCC or Clang be taught to warn about *all* implicit
shortenings, as MSVC does, not just 64-bit-to-32-bit shortenings?)

Change-Id: I88c0b0aa2f1b306f58952589ff8bcae17bc29768
Reviewed-on: https://code.wireshark.org/review/4676
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-14 07:12:12 +00:00
Guy Harris abd657fd62 Squelch another warning.
(Yes, we should, on platforms with a 32-bit time_t, check to make sure
the time stamp fits and do something if it doesn't.  Or we should make
the seconds part of an nstime_t be 64-bit and handle overly-large values
when converting them to year/month/day/hour/minute/second.)

Change-Id: If219534985dce29d00754ff151f6c4b5893080d8
Reviewed-on: https://code.wireshark.org/review/4675
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-14 07:10:21 +00:00
Guy Harris 7d28a56076 Squelch a compiler warning.
Change-Id: I5b383c967c465882819ac449fbd54915bc692687
Reviewed-on: https://code.wireshark.org/review/4674
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-14 07:07:42 +00:00
Guy Harris a5d35a25a1 Clean up comment.
Change-Id: I9a620da95c1dd9b173cebe28f790eeb50e3f9a8f
Reviewed-on: https://code.wireshark.org/review/4673
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-14 06:55:50 +00:00
Guy Harris 4495753b69 Get rid of out-of-date comment.
Change-Id: I68e85e2e29e1154170ccc50488ec943958978150
Reviewed-on: https://code.wireshark.org/review/4672
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-14 06:47:49 +00:00
Guy Harris fa6e907711 Initial version of support for Colasoft Capsa files.
The time stamp origin is not correct.  Capsa's absolute time stamp for
the sample captures from their Web site would be helpful.

Change-Id: I365daf7b42240e33f54df76939254f41ed57a9b2
Reviewed-on: https://code.wireshark.org/review/4671
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-14 06:45:35 +00:00
Bill Meier 0149015b6e packet-gvsp.c: Fix license; Remove unneeded code from proto_reg_handoff..(); adjust whitespace.
Change-Id: I24a9033bbed3d50daf886f3d00239c1580894c35
Reviewed-on: https://code.wireshark.org/review/4670
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 06:14:17 +00:00
Alexis La Goutte 96a1bf095f NSIS: Wireshark GTK is Wireshark legacy (and no Wireshark 1...) !
Change-Id: I3b4f4ca28bc7d363474bc888b6a3a8ddbdb7dab9
Reviewed-on: https://code.wireshark.org/review/3867
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-14 04:49:45 +00:00
warrenm ea1137881a Adding GigEVision GVSP dissector
Bug: 8673
Change-Id: I4e8270c76291d6ea0e0187f00a342804275f2c11
Reviewed-on: https://code.wireshark.org/review/4547
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-14 04:08:55 +00:00
Hannes Mezger 03bc68c301 fix forward declarations in opcua_serviceparser.h
The declarations from opcua_complextypeparser.h were used instead of the serviceparser ones, this is also fixed in our generator

Change-Id: I3d78d26a3b2b4995dfd4556720d29ecdd6960c4b
Reviewed-on: https://code.wireshark.org/review/4650
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 21:29:49 +00:00
Pascal Quantin fb27a682a1 NCP: cast to guint instead of gulong
Change-Id: Idc8f8f3177703ce5546b8a472034705cb6070707
Reviewed-on: https://code.wireshark.org/review/4666
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13 21:16:03 +00:00
Martin Kaiser 8342eb891d smartcard descriptor: bitmask for pin support field
Change-Id: If0e5cd90ff73bfbb211970f9a24974119c6ec550
Reviewed-on: https://code.wireshark.org/review/4664
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-13 20:29:03 +00:00
Martin Kaiser 9dd515cbd7 smartcard descriptor:
dissect number of lines, characters per line in the lcd layout

Change-Id: I36c9c6f2e73cdfde8a9b7c4ad0450d93722fca2b
Reviewed-on: https://code.wireshark.org/review/4663
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-13 20:28:38 +00:00
Martin Kaiser 15f23c735b smartcard descriptor: the lcd layout is two bytes long
Change-Id: Ie8fd82d652a9a3fc1d3139ab610bbaa7a5ecd32d
Reviewed-on: https://code.wireshark.org/review/4662
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-13 20:25:51 +00:00
Pascal Quantin 89a95f2205 Add Kerberos 3.2.2 package for Win64
Change-Id: If02469aa1a01972d2032478dce3bf872802f37cb
Reviewed-on: https://code.wireshark.org/review/4661
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13 20:15:27 +00:00
Pascal Quantin 1f481258da Upgrade Win64 GTK2 package to 2.24.23-3.39
Change-Id: I0f5f27aa2fc13f38af73a42e1c6e4a36636d2fc7
Reviewed-on: https://code.wireshark.org/review/4656
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13 19:33:07 +00:00
Roland Knall 05a6615965 extcap: Remove single-space argument for boolflags
Boolflags will be added with a NULL argument to the
 list and therefore the original fix will work.

 Note: extcap_get_complex_as_string will convert any NULL
 value into a single character argument (' '). Therefore
 any argument type, where NULL is a special value should
 be handled seperately here. For now, the only datatype
 will be BOOLFLAG

Change-Id: Icfc9b573214e05ea713a3b70ea37953d470dafae
Reviewed-on: https://code.wireshark.org/review/4649
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Tomasz Moń <desowin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13 19:26:46 +00:00
Mikael Kanstrup 74c4358740 Split ws80211_get_phys callback handler
Split up the ws80211_get_phys parser callback handler function into
separate functions for each attribute parsed. This is done in
preparation for supporting split wiphy dump feature where the function
logics will need modications.

Change-Id: Ic0b497fc628f0e7453cd62eb8199f17f9a308a7f
Reviewed-on: https://code.wireshark.org/review/4610
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 19:19:56 +00:00
Stig Bjørlykke ab7f9aa164 BER: Code cleanup in call functions
Change-Id: I0ba958485dffd3cc1e419fb27cf7f2bc492d05fe
Reviewed-on: https://code.wireshark.org/review/4643
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-10-13 19:18:48 +00:00
Bill Meier 6a9479ecf9 Add editor modelines and/or adjust whilespace.
Change-Id: I626b7bd8ac6e4b91c57cc9152e7ce038754e7278
Reviewed-on: https://code.wireshark.org/review/4658
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-13 19:09:07 +00:00
Pascal Quantin 63faad686b NCP: add a missing cast following g6ca40c5
Change-Id: I0b93c4faab52d830b8160d89b9bb8026ab2a216e
Reviewed-on: https://code.wireshark.org/review/4657
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13 19:07:07 +00:00
Stig Bjørlykke b653564fe2 Lua: luaL_checkstring does not return NULL
Removed all checks for NULL strings to cleanup the code.

Change-Id: Ia890cd9b206296f586e85214f07765f14984580b
Reviewed-on: https://code.wireshark.org/review/4632
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-13 19:06:40 +00:00
Roland Knall 9ce5ca581d extcap: Catch unknown arguments to fix spaces
- If boolflags are being used, an extra space is added
   to the call of the extcap filter. This leads to the
   argumentparser of python to exit with an error-code,
   and the extcap filter will not start. This patch instead
   catches the unknown arguments and prints them on stdout,
   as well as running the dissection with the rest of the
   arguments list.

   Basically this is a work-around, for a behaviour not
   yet fixed in extcap, but it stabilizes the usage of the demo

Change-Id: I7589292692b0b3c839909fd09d62a4714cbe869e
Reviewed-on: https://code.wireshark.org/review/4638
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Tomasz Moń <desowin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13 18:48:35 +00:00
Alexis La Goutte 631834ff51 IPv6: use proto_tree_add_item for IPv6 Routing Header Next and Length
Like other header (Fragment, Hop by Hop...)

Change-Id: I5d0a85bf285b37eed38345d659439400c5f50d06
Reviewed-on: https://code.wireshark.org/review/4634
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 18:16:39 +00:00
Evan Huus b9988e2bbf ncp2222: don't overflow buffer constructing string
Fixes stack-smashing vuln.

Somehow there was already an XXX in the code about this, but nobody realized at
the time it was worth fixing... really?

Bug: 10552
Change-Id: I849068bd6c45146339444f295b72430d3c6e08f2
Reviewed-on: https://code.wireshark.org/review/4653
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 16:59:51 +00:00
Evan Huus 8fb74b4a68 extcap: remove use of g_list_free_full
It requires a newer glib than we support

Change-Id: Id8f14d4188a9ba55e0a5196bb877e2fe6a0c8d3f
Reviewed-on: https://code.wireshark.org/review/4652
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 16:09:47 +00:00
Stig Bjørlykke 4f37f554f1 RTSE: Return dissected length from call_rtse_oid_callback
Change-Id: I6766135ddcdfe25d9bcc060bb2a47376abb36794
Reviewed-on: https://code.wireshark.org/review/4642
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 16:01:36 +00:00
Stig Bjørlykke 748e522815 ROS: Return dissected length from call_ros_oid_callback
Change-Id: I8d119cd3dc9ac0a724497400680a70f39fc21ede
Reviewed-on: https://code.wireshark.org/review/4641
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 16:01:19 +00:00
Alexis La Goutte 24b6a1141a IPv6 RPL option is read as less bytes than it is
Add check if the opt len equal to the "calculcate" length
and display expert info if not.. also replace offset by the opt len

Bug:10559
Bug:10561
Change-Id: I6e80e4055b6d0c5ef3f030c544cd1629e6b9abec
Reviewed-on: https://code.wireshark.org/review/4627
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 15:47:05 +00:00
Tim (Thanh) Nguyen a9497befeb RoCE and CM dissector fixes
- fixed cm.req cm.rep bit fields
- fixed packetLength and CRC length for RoCE
- use "RoCE" or "RRoCE" instead of "InfiniBand" in COL_PROTOCOL where appropriate

Change-Id: Id491658f9368034bb2267922fa5618e1c259cd56
Reviewed-on: https://code.wireshark.org/review/4614
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 15:45:33 +00:00
Alexis La Goutte c4acc4bea4 extcap (GTK): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ifdba972e3a12e01ac80bc920a2100bd7aa0f733c
Reviewed-on: https://code.wireshark.org/review/4622
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 15:43:34 +00:00
Pascal Quantin b3ad51db7c Follow-up of ged0b19b (Make boolean bitmask type 64-bit wide)
- use G_GINT64_MODIFIER instead of "%ll"
- use G_GUINT64_CONSTANT instead of ULL
- add some missing explicit casts

Change-Id: Ic048d9ee8966ea504ea542cefe55688edcfb2dc7
Reviewed-on: https://code.wireshark.org/review/4644
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-10-13 15:34:09 +00:00
Alexis La Goutte e8a63a5a46 SPDY: Add Slot field for SYN_STREAM (and also unused field...)
Ping-Bug: 10566
Change-Id: I4d3d991eb8b5ede349a361d1f6b605b4a67a98b6
Reviewed-on: https://code.wireshark.org/review/4645
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 15:07:59 +00:00
Alexis La Goutte 017fc82d74 SPDY: Fix bitmask for priority bit
Found by yurui ming

Ping-Bug: 10566

Change-Id: I92e784eb91dc6c88af409e2936671b0ea473fba9
Reviewed-on: https://code.wireshark.org/review/4637
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 12:25:56 +00:00
Alexis La Goutte 2c23c7e79d SPDY: Fix the display of COL_INFO...
Clear the COL_INFO before start to dissect SPDY PDU

Change-Id: I7a22515f1c2c89b5647003320ff455a74fbce42a
Ping-Bug: 10566
Reviewed-on: https://code.wireshark.org/review/4636
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 12:24:10 +00:00
Stig Bjørlykke ebbe70b335 ASN1: Register BER syntaxes as NEW
Change-Id: Id85eaecd84dbe1115935e1977dca321fd601d986
Reviewed-on: https://code.wireshark.org/review/4639
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-13 12:22:13 +00:00
Alexis La Goutte 71ae57e38d IPv6: Fix typo for Fragment nxt (Next Header)
Change-Id: Id7d6cd4a4c09238890394d5dc887ec840dc2d2af
Reviewed-on: https://code.wireshark.org/review/4633
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 12:18:30 +00:00
Stig Bjørlykke 313c4005f9 P1: Added ORAddress and ORName syntax.
Change-Id: Icf8e8cb2988d9134aa65f04a3459e4a4c4a5721f
Reviewed-on: https://code.wireshark.org/review/4640
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-13 11:40:00 +00:00