Public Git Hosting - wireshark.git/log

Tight array index guard in packet-umts_fp.c

Fixes bug #9828.

Change-Id: I69b02a0d51921bae77850b599144f35a4fe9ee33
Reviewed-on: https://code.wireshark.org/review/560
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit ddd9d274b96a28dd15f7fcb7702cdcaecf5b12e0)
Reviewed-on: https://code.wireshark.org/review/1206
Reviewed-by: Evan Huus <eapache@gmail.com>

Allow FT_BYTES, FT_NONE, FT_STRING use length "-1"

All three types support zero length, so using
-1 (aka length remaining) should be safe.

(cherry picked from commit 16d45a69caf1d47e381c661ab6b2269116084e62)

Conflicts:
epan/proto.c

Change-Id: I23a7162d7023a7319f57e4bc12801f9d8dfb5ccf
Reviewed-on: https://code.wireshark.org/review/1149
Reviewed-by: Michael Mann <mmann78@netscape.net>

Bluetooth: ATT: Add missing offset calculations

(cherry picked from commit 444cdf5f6b6994706347f703b248bb1507c38888)

Change-Id: Ic1f010171eccfa3639a64a7e9309eb02c64c5d4f
Reviewed-on: https://code.wireshark.org/review/1150
Reviewed-by: Michael Mann <mmann78@netscape.net>

Use a simple "git describe".

This matches the behavior of the master branch.

Change-Id: Iea987cd5ce5b5b18ca331cc77c1bce6683970934
Reviewed-on: https://code.wireshark.org/review/1125
Reviewed-by: Gerald Combs <gerald@wireshark.org>

[Automatic manuf, services and enterprise-numbers update for 2014-04-13]

Change-Id: I418b3025859e54cf1ffc1c834614e59df67668ec
Reviewed-on: https://code.wireshark.org/review/1086
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Fix warnings introduced in 1199c6611575383de43ff05c1fcd21a3e12e96bc

Change-Id: I4603798c6c620d87a965969c2f6125c89cedb162
Reviewed-on: https://code.wireshark.org/review/1069
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

The "not DNS" filter used UDP in the description but matched against
TCP. DNS runs over both so update the filter to exclude both.

Thanks to Yaron Fainstein for noticing this.

Change-Id: I0c4d1fef7f8d725bf656cca87ba5908893fff0b2
Reviewed-on: https://code.wireshark.org/review/1028
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 84a57cb2ebd2b9c7605bf56395d19d3be0a5feea)
Reviewed-on: https://code.wireshark.org/review/1031

[Automatic manuf, services and enterprise-numbers update for 2014-04-06]

Change-Id: I16ed704d16c957e52a36af79edff626d4a9d67c0
Reviewed-on: https://code.wireshark.org/review/980
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Have Infiniband dissector show payload. Bug 9929.

The trees in the infiniband dissectors were incorrectly setup causing the data dissector to always have a NULL tree (so it wouldn't appear in packet view).

Didn't clean up the global variables like in the trunk because all APIs aren't supported.

Change-Id: I320fd674208394fb9bd48dc0b88e005b96466937
Reviewed-on: https://code.wireshark.org/review/932
Reviewed-by: Michael Mann <mmann78@netscape.net>

Fix InfiniBand dissector. Bug 9719

Change-Id: I7b9df14b4d9aa520c3fe28c86014665461b758f2
Reviewed-on: https://code.wireshark.org/review/917
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 761464f8ad2c82ecc36c920c775e192648ea07fb)
Reviewed-on: https://code.wireshark.org/review/919
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

replace comparing sequence numbers of TCP segments with wrap-friendly XX_SEQ macros; replace tabs with 2 whitespace indentations

Change-Id: I8af522cc34863501195d0a79db5c0ab4135246a8
Reviewed-on: https://code.wireshark.org/review/907
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Conflicts:
epan/follow.c

(cherry picked from commit 47d296709dcd0ed1fc8900de12648583c9df7b43)

Change-Id: I5c5f27bd328c07cc65731b3ad6566cef77166700
Reviewed-on: https://code.wireshark.org/review/912
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

fix comparing a sequence number of TCP fragment when its value wraps over uint32_t limit

Change-Id: I0ff939e2d1265a2d9380c83f8f538bb43b0dadf9
Reviewed-on: https://code.wireshark.org/review/875
Reviewed-by: Pavel Karneliuk <pavel_karneliuk@epam.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 0b5f26b67d68bdfd7e59c191cefe407f19edcafc)

Change-Id: I39b53781ab9738dac636654bc80fccd975807586
Reviewed-on: https://code.wireshark.org/review/911
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Tighten the NO_MORE_DATA_CHECK macros

We should return if we've already somehow overflowed the apparent length, not
just if we've hit it dead on.

Fixes bug #9932 and probably others.

Change-Id: I2719c3bd38f03e18ea557df962ee4a1beb64c2e8
Reviewed-on: https://code.wireshark.org/review/862
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
(cherry picked from commit adc46f571c0357f7600c5cc49c21a8e1403a2af0)
Reviewed-on: https://code.wireshark.org/review/895
Reviewed-by: Michael Mann <mmann78@netscape.net>

[Automatic manuf, services and enterprise-numbers update for 2014-03-30]

Change-Id: I202854f3b8fdf0a93a7aba3f49658f8f270fa487
Reviewed-on: https://code.wireshark.org/review/870
Reviewed-by: Evan Huus <eapache@gmail.com>

Fix crash when calling "MAP Summary" dialog when no file is open

Fixes bug 9934

Change-Id: I2915d0715431cf983511fe7f5f036be99bbd2467
Reviewed-on: https://code.wireshark.org/review/853
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit 3438243c1e976374314a5377237fa352bf5247e7)

Change-Id: I006d8fd2f50bebd21d1c54be76a3738f65087c73
Reviewed-on: https://code.wireshark.org/review/854
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>

LTE RRC: fix dissection of SystemInfoListGERAN IE

Change-Id: I502f7cd97cf00822900b4cd09e183e3b491c1437
Reviewed-on: https://code.wireshark.org/review/831
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit 38388d5c811b09c9931f26a6f437c87fb2abadc6)

Change-Id: I2dc953b659c2a2fece16ac04bd2fd3f52fba69e8
Reviewed-on: https://code.wireshark.org/review/836
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>

[Automatic manuf, services and enterprise-numbers update for 2014-03-23]

Change-Id: I9a93d0613a854b92764b2f3d3d900899dfef9ff4
Reviewed-on: https://code.wireshark.org/review/794
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Fix master-1.10 typo bug in ieee80211 preventing build

There was a typo and apparent merge error in packet-ieee80211.c preventing building
of master1-10.

Change-Id: If0287028264c3217ea1f05125d5da2d4c70d1d9f
Reviewed-on: https://code.wireshark.org/review/782
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

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>
Reviewed-on: https://code.wireshark.org/review/781
Reviewed-by: Anders Broman <a.broman58@gmail.com>

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>
Reviewed-on: https://code.wireshark.org/review/760

Fix 1.10 Buildbot...

Change-Id: Iab9a1a92d1392e016c1d022558e6d0983b9b449b
Reviewed-on: https://code.wireshark.org/review/712
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Fix some typo on 802.11 dissector
(Found by Jalil Moraney in change to add 802.11ad support review 632)

Reviewed-on: https://code.wireshark.org/review/708
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 66d0b1893a8b0786abef967b7f743cedb7143d87)

Change-Id: Id4c71f84b26a5120d7430da28c97a47708515812
Reviewed-on: https://code.wireshark.org/review/711
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Fix some typo on 802.11 dissector
(Found by Jalil Moraney in change to add 802.11ad support review 632)

Reviewed-on: https://code.wireshark.org/review/708
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 66d0b1893a8b0786abef967b7f743cedb7143d87)

Change-Id: Ieeef1bba4c6d1f164f587b9f9becbbe490ac1e27
Reviewed-on: https://code.wireshark.org/review/710
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

[Automatic manuf, services and enterprise-numbers update for 2014-03-16]

Change-Id: Ia6e836cb5878536d9fcc09f2a6a94cf3e4bc0870
Reviewed-on: https://code.wireshark.org/review/697
Reviewed-by: Evan Huus <eapache@gmail.com>

Fix bug 9021: 'RTP not decoded inside the conversation in v.1.10.1'

The behavior for SIP/SDP handling of RTP conversation tracking
changed in v1.10, with some unintended consequences. The bugs did not
show up at the time because wireshark makes 2 passes of the packet list,
and so the problems auto-corrected themselves in most cases. Unfortunately,
a change in r53641 modified how UDP behaves, making it always create
conversations for UDP packets, and that exposed the bugs inherent in the
SIP/SDP code changes.

This commit reverts the behavior of SIP/SDP to its pre-1.10 model, but
creates a new preference setting for "Delay SDP changes for tracking media",
which if enabled, will turn on the new (but buggy) model introduced in 1.10.
This preference is *disabled* by default, since for a majority of cases the
new behavior is worse than the previous behavior.

The preference, and this commit's fix, is not intended to last long. I intend
to re-write the SIP/SDP/RTP interaction model for release 1.11 - I think it's
too big a change for 1.10, however, which is why I submitted this commit.

Change-Id: Ic5601749d6c2344e952ced8206dd9296bfdc4b90
Reviewed-on: https://code.wireshark.org/review/543
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-on: https://code.wireshark.org/review/621
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Thou shalt not put newlines in the strings in value_string tables.

That just breaks too many things.

This catches the examples of that found in bug 9878. There might be
others that my grepping didn't find.

We should also have the checkAPIs.pl script check for this, so this
isn't a full fix for bug 9878.

Change-Id: I9a25d8895b5febd2be55fc84332329fdf5b01ca0
Reviewed-on: https://code.wireshark.org/review/625
Reviewed-by: Guy Harris <guy@alum.mit.edu>

MAC LTE: fix a typo in Buffer Size value_string

Change-Id: Ie38726fb51a74bbcdc630550e61fa0e934ffdd1e
Reviewed-on: https://code.wireshark.org/review/618
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit 70ff7be1e6735cd9b00bfeb1c23bf19cf1250c01)

Change-Id: Iebc917ac138b1c3abfe9fb1bf00dd8730ac44319
Reviewed-on: https://code.wireshark.org/review/619
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Always have WS_DLL_PUBLIC include "extern".

This may fix some issues Albert Chin found on Solaris, which might be
due to variables being defined, not just declared, in header files due
to the lack of "extern".

Done by backporting some changes from the trunk, but without renaming
WS_DLL_PUBLIC_NOEXTERN to WS_DLL_PUBLIC_DEF, so that we don't have to
change any other files.

We also pick up comments from those changes.

Change-Id: I6b0b9ee59a2379fca3279a17774f637b26f0b48d
Reviewed-on: https://code.wireshark.org/review/611
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Replace one more g_memmove with memmove, add a cast to make the Lua stuff
compile.

svn path=/trunk/; revision=54296

Change-Id: Ia6a38fa16e74a9d39217cf06433786fb68653893
Reviewed-on: https://code.wireshark.org/review/607
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

Fix incorrect file in epan/Makefile.am when build with ENABLE_STATIC

Change-Id: I7f76e3e3d2d6f3edd2a658fccd5953393ef74ed8
Closed-bug: 9871
Reviewed-on: https://code.wireshark.org/review/596
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 1cde337fee8e8af968e872115d9c7b11a9eaa81e)
Reviewed-on: https://code.wireshark.org/review/604

Revert some debugging code.

Change-Id: Ie1c99c6f99068fbe99cf06df367cedee83c31655
Reviewed-on: https://code.wireshark.org/review/591
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 20c0878ff825ea549e11c3b68371397b4f725e3a)
Reviewed-on: https://code.wireshark.org/review/598

Fix Bug 9853: 'Lua: trying to get/access a Preference before its registered causes a segfault'

Accessing a pref before it's registered causes a segfault, because prefs_p->next
is not being checked for NULL in wslua_proto.c:Prefs__index().

Change-Id: I270978ddb9238a9e8d2c533a96fc01ee0df385c7
Reviewed-on: https://code.wireshark.org/review/563
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/572

[Automatic manuf, services and enterprise-numbers update for 2014-03-09]

Change-Id: I3b1885b51d3f01f2ca78c994f479cce095881b1e
Reviewed-on: https://code.wireshark.org/review/570
Reviewed-by: Evan Huus <eapache@gmail.com>

Ensure that the input to strtoul ends with a null.

Otherwise it runs past the end of the array into stack memory. Should fix the
intermittent DVB-CI decryption test suite failures.

Change-Id: Ice17497e661c8579baf3a546efcb5529beda6b49
Reviewed-on: https://code.wireshark.org/review/559
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-on: https://code.wireshark.org/review/566

Use &GitVersion; to fix guide creation

Change-Id: I4b268d5c7f371ce8b5420586f8ea3a2ff0dd302b
Reviewed-on: https://code.wireshark.org/review/561
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>

Fix bug 9835 disabled second media stream disables all media streams

When a single media line is rejected in an SDP answer, for example a second
'm=video' line, wireshark disables ALL media sessions, instead of just that
one. But per the RFCs, all it should do is disable just the one RTP media
session the m= line represents. This commit fixes that, so that a disabled
media session (one with a m= port of 0) in the SDP answer only disables its
associated/paired media stream in the offer.

Conflicts:
epan/dissectors/packet-sdp.c

Change-Id: I9bd0d3fc88b8eaa55207c9bf3f3e37da7746fd14
Reviewed-on: https://code.wireshark.org/review/526
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
(cherry picked from commit 058527f3f19a09c332b6877030b13dedf7414c1b)
Reviewed-on: https://code.wireshark.org/review/555

1.10.6 → 1.10.7.

Change-Id: I25552020bd642e0de387427cc3b7c468f845c4b9
Reviewed-on: https://code.wireshark.org/review/553
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Build 1.10.6.

Change-Id: I062d763ca579febcb9b622c6cc54394c7dc25cc7
Reviewed-on: https://code.wireshark.org/review/551
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Add a CVE ID and attribution.

Change-Id: If3359fb1c73446747c6be4ab1f8b05f2697dba6f
Reviewed-on: https://code.wireshark.org/review/541
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Add wnpa-sec-2014-04.

Change-Id: I3ca3843bf7f25aeafb35c4352367e36ba3f9c41a
Reviewed-on: https://code.wireshark.org/review/540
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Add a check for an oversized record.

For now we declare the file corrupt and give up. We may want to handle
this more gracefully. Fixes a vulnerability discovered by Wesley Neelen
(bug 9843).

Remove the RCS ID and add modelines.

Change-Id: I418938d7d6485b27cc51cf1dde50bc42dabf8c85
Reviewed-on: https://code.wireshark.org/review/533
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Add CVE IDs.

Change-Id: Iff81dd013812e79d4c70018cae48b3c16495a3af
Reviewed-on: https://code.wireshark.org/review/523
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Fix another case of a missing BASE_EXT_STRING (which may cause a crash).

Change-Id: Ibe690826747b47d8b9a5e93f1ad3e96f2f18e7ef
Reviewed-on: https://code.wireshark.org/review/514
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>

Fix some cases of value_string_ext without BASE_EXT_STRING.

This fixes bug 9834.

Change-Id: Ida6034fd4149b647545ed314eb10819e71553f85
Reviewed-on: https://code.wireshark.org/review/512
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Fix 2 instances of "Warning: Extended value string ... forced to fall back to linear search".

Note: This issue was fixed in dev Wireshark as part of a much more extensive set
of changes.

Change-Id: Iadca7e7813f42029e62c922ed183b6535a9c2a77
Reviewed-on: https://code.wireshark.org/review/510
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>

Backport 2336eb9 (python3 compatibility) from git/master to git/master-1.10

Another Fix for part 2 of Bug #9834

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9834

============
    commit 2336eb9919e20de306b29ab34d1ca12550930f4a
    Author: Gerald Combs <gerald@wireshark.org>
    Date:   Fri Aug 2 00:22:51 2013 +0000

        Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5,
        2.7, and 3.3.

        svn path=/trunk/; revision=51106
        /tools/make-tap-reg.py

Change-Id: I2a7aca979c596b4d06e91490aaf42126bb9da211
Reviewed-on: https://code.wireshark.org/review/509
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>

Backport g97c9a9b from git/master to git/master-1.10

Fix for part 2 of Bug #9834

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9834

========
    commit 97c9a9b9ba3c29f394c306d6ba9bd1916d06c430
    Author: Gerald Combs <gerald@wireshark.org>
    Date:   Fri Aug 2 16:34:31 2013 +0000

        Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5,
        2.7, and 3.3. The contents of packet-ncp2222.c are different after the
        changes (e.g. some array contents are in a different order) but the
        output of running 'tshark -nVxr' on the NCP files in the menagerie are
        identical.

        svn path=/trunk/; revision=51123

Change-Id: Ib500bade79d65b97a57eeb4dd497228a6eb85c19
Reviewed-on: https://code.wireshark.org/review/508
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>

Update the release notes.

Change-Id: Iec747ea0f92142a81a88b6ff92d9dd3ec1818e7e
Reviewed-on: https://code.wireshark.org/review/506
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Disable IPv4 checksum verfification to match TCP and UDP.

Offloading seems to be very common nowadays and having this option
enabled by default generates a lot of false positives. Suggested by
Laura Chappell.

Change-Id: I285f218efb3c9f164d8ad7a6d6de8270e442ffff
Reviewed-on: https://code.wireshark.org/review/426
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(cherry picked from commit 104a6edd1fb703c5c2319c893720df86f8c9a9e7)
Reviewed-on: https://code.wireshark.org/review/470
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Switch to "rc" instead of "pre" to match our tags.

Change-Id: I539b7287cd9d91bc88549d56283beb3f1ab1ff8e
Reviewed-on: https://code.wireshark.org/review/489
Reviewed-by: Gerald Combs <gerald@wireshark.org>

More version stamp fixes.

Change-Id: I80601db962734364575c989ecd64983ef5a493a2
Reviewed-on: https://code.wireshark.org/review/487
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Don't append "-dirty" to the version string.

Change-Id: I755a6229537745eca07f2fc467b9db9e6130b301
Reviewed-on: https://code.wireshark.org/review/485
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 7bb4ec81a7912a785758cd63570dab1d00da2647)
Reviewed-on: https://code.wireshark.org/review/486

Strip out carriage returns when reading version.conf.

The input record separator ($/) under Cygwin's Perl appears to be "\n"
which means that chomp() won't strip out carriage returns. Make sure
we do that when reading version.conf, otherwise we can end up with
unexpected behavior.

Check pkg_enable using an integer comparison as an extra level of
protection.

(We need to handle CRs better in general but for now we need to get
version stamping working for the next release.)

Change-Id: I19974467d1a7386728b69dca77f74e678d66ca6b
Reviewed-on: https://code.wireshark.org/review/483
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit d70016fdd64f05093863c7fe66fe4c5f7343d8c0)
Reviewed-on: https://code.wireshark.org/review/484

Update .gitignore to add some Windows specific build stuff to ignore list.

svn path=/trunk/; revision=50231
(cherry picked from commit e66457472d52fc96a1b5d3c30beed4b07f14fe8b)

Change-Id: I41fd7ba5ce96055928d65fb5de4252750692078e
Reviewed-on: https://code.wireshark.org/review/481
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

[Automatic manuf, services and enterprise-numbers update for 2014-03-02]

Change-Id: Ifd0cc536cc7b532f61aaae3aa9e9642f1299405b
Reviewed-on: https://code.wireshark.org/review/445
Reviewed-by: Evan Huus <eapache@gmail.com>

Have git-compare-abis build in a sub-sub-subdirectory.

We have a lot of relative includes which apparently weren't updated
correctly when we moved the gtk directory to ui/gtk. For example,
ui/gtk/about_dlg.c has

The Autotools Makefile adds "-I../.." to the include path, which means
we end up including the current, top-level version_info.h instead of the
one in the compare-abis build directory.

Change-Id: I9df83857fc9f7d87a3b79d5b4da08d5e41625e4c
Reviewed-on: https://code.wireshark.org/review/436
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Don't mix emem and glib memory and init routines.

The seasonal memory is freed before the init routine is called, leading to a
whole bunch of use-after-free errors.

Fixes bug #9802 (and duplicates).

This introduces a few minor leaks but I can't find an easy way to add additional
free calls that doesn't lead to double-free errors.

Change-Id: Idda79cb643d46d29253165cdeefeed189db6b078
Reviewed-on: https://code.wireshark.org/review/406
Reviewed-by: Evan Huus <eapache@gmail.com>

Release note updates for 1.10.6.

Change-Id: I1a921df33d317a87ca1de6257c3783f0bfd3505f
Reviewed-on: https://code.wireshark.org/review/374
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Reject pcap files that claim on-the-wire packet sizes > 64MB. This fixes many
heuristic cases broken in r49999 when we permitted packets > 64KB, since that
relaxed so severely the definition of a valid packet header.

64MB is an arbitrary and perhaps suboptimal number, but it seems to do the right
thing in all the examples I have handy.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9634

svn path=/trunk/; revision=54812
(cherry picked from commit dae86605b61bbbabd54749e6bde7c0c10b031ca8 with
release note updates)

Change-Id: Id3a9b413113148c8072bdd6c221246a56d0df2cb
Reviewed-on: https://code.wireshark.org/review/349
Reviewed-by: Gerald Combs <gerald@wireshark.org>

If Gtk >= 3.10, allow use of deprecated Gtk features (and prevent 'deprecated' warnings);

Given that Wireshark is moving to QT, the Wireshark changes required to
fix the features deprecated in Gtk 3.10 will not be done.

svn path=/trunk/; revision=54337
(cherry picked from commit 6ec4ba58a18298d443d87de2cd8bd64dc97464e1 with
release note updates)

Change-Id: Ic6e8f44e201a1e487ed969bbdcfaa3f40c00e682
Reviewed-on: https://code.wireshark.org/review/347
Reviewed-by: Gerald Combs <gerald@wireshark.org>

From stcook
clear the temporary buffer after each DXM channel data line

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9598

svn path=/trunk/; revision=54488
(cherry picked from commit 745c8660be2707df41d7cea3cd2725d18b9d6ff0)

Change-Id: I420ca616a6c19489214100d86446450905c4234d
Reviewed-on: https://code.wireshark.org/review/346
Reviewed-by: Gerald Combs <gerald@wireshark.org>

"Better" fix for OpenSafety heuristics with Modbus/TCP. Bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572)

From Roland Knall

This fix is on top of/in conjunction with r54193 and both need to be backported.

svn path=/trunk/; revision=54463
(cherry picked from commit 6697a94ba55934a132154439dc44b378cbf991e3 with
release note updates)

Change-Id: I0fa9fbf6f7429fb6d8ad53731d7760f62edb1b02
Reviewed-on: https://code.wireshark.org/review/345
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Bugfix OpenSafety "heuristics" to only consider a packet "handled" if a subdissector is called. Fixes bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572)

Also removed tree check in Modbus dissector because dissector_try_string() is being called under it.

svn path=/trunk/; revision=54193
cherry-picked from 6db9eb0b73b4bb02864ab389c74f5a17a9da50e2. Added
release note entry.

Change-Id: I9bad5846d08cbf8b9c40c6a17a7f88712451794e
Reviewed-on: https://code.wireshark.org/review/344
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Don't intentionally use -1 as an hfindex: while only naughty before, with the
changes from r49644 you'll get complaints about the hf being unregistered...

Note that this code also intentionally passes -1 as an ett_index. It doesn't
currently complain so I'm leaving it alone for now...

svn path=/trunk/; revision=49648
(cherry picked from commit 813dcf79a15d6527cce8a6a7bac4234de6ab577f)
Change-Id: I2bca70df606397264df54e88ce6fa85815aaf1b9
Reviewed-on: https://code.wireshark.org/review/338
Reviewed-by: Gerald Combs <gerald@wireshark.org>

NAS EPS: fix dissection of CS service notification message

Fixes bug 9789

Change-Id: I26ed1e9d8bb5b662af97d19f64b5f4b39374a5ee
Reviewed-on: https://code.wireshark.org/review/330
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit dd4e5fcbdd1c54afd9da2764b00f8fef2febb682)

Change-Id: Ia2d3cbdeda7935cec07fbfbb2c0d6b7cb2841288
Reviewed-on: https://code.wireshark.org/review/333
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

[Automatic manuf, services and enterprise-numbers update for 2014-02-23]

Change-Id: Ida5492e584bea365c0c9ec1b3a449c253b251122
Reviewed-on: https://code.wireshark.org/review/317
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Add bug 9492.

Change-Id: I412d5c56848f2a19c8bf2c2e50f1ad1db86ce793
Reviewed-on: https://code.wireshark.org/review/306
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-on: https://code.wireshark.org/review/308

Add MPLS dissector to "ppp.protocol" table. Bug 9492 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492)

From Peter Paluch

svn path=/trunk/; revision=53694

Change-Id: Iee6b51807491170967a2822db8ccbab9b1e36204
Reviewed-on: https://code.wireshark.org/review/304
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Fix typo in name of Radio Type 802.11b (in IEEE802.11 WTP Radio Information)

Found by Massimo Vellucci

Change-Id: Ibbe2d0a4d1e421e647028262baf0398d05905c8d
Reviewed-on: https://code.wireshark.org/review/246
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(cherry picked from commit 8a1cead94713f0c7c6e2f5cc58aa1d0f6c8f2a60)
Reviewed-on: https://code.wireshark.org/review/289

Add message type from RFC5416 : Section 3 : IEEE 802.11 Specific CAPWAP Control Messages

Issue found by Massimo Vellucci (SmartCAPWAP)

Partial-Bug: 9752

Change-Id: I6f61a3c8706572e9ea7935e8f00818e6aa9fef7a
Reviewed-on: https://code.wireshark.org/review/193
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(cherry picked from commit a9dc8016e9d37663c3d09f1563f993182a979554)
Reviewed-on: https://code.wireshark.org/review/290

Properly decode CAPWAP Data Keep-Alive's. Bug 9165 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9165)

From Andreas Schultz

From me: Use expert API instead of throwing exception for a bad length.

svn path=/trunk/; revision=52657

Manual Backport to 1.10 (Use old expert API)

Change-Id: Iab31aeb9521630d3ad69bb8b7fe5f10d4d95cee7
Reviewed-on: https://code.wireshark.org/review/288
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Force "printing" if -T is specified, even if -w is also specified.

Just as "tshark ... -P -w xxx" writes raw packets to xxx *and* writes
text packet summaries to the standard output, and just as "tshark ...
-V -w xxx" writes raw packets to xxx *and* writes text packet details to
the standard output, so should "tshark ... -T fff -w xxx" write raw
packets to xxx *and* write whatever "-T fff" (and any "-e" options)
specifies to the standard output.

Change-Id: I28ab3a4d48531f297533ec4dfb3742031eb69885
Reviewed-on: https://code.wireshark.org/review/278
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-on: https://code.wireshark.org/review/279

More SVN → Git conversion.

Change-Id: Iddb56a54befd187f87f7a250f1fb38c4d2cc59b2
Reviewed-on: https://code.wireshark.org/review/265
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Add NSIS path discovery to config.nmake.

Chocolatey wants to install NSIS in "c:\Program Files" no matter what. Try
to locate makensis automatically, similar to the way we locate Python.

svn path=/trunk/; revision=51497
(cherry picked from commit dc87fa2d68a5dbc7693b5cc93e044a62af5ce39c)

Change-Id: I42d6084e3699275d8212c6e37f8f776f12b343f3
Reviewed-on: https://code.wireshark.org/review/262
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Replace "svn" with "git" all over the place.

Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`
for package names by default.

Cherry-picked from gf966980 with a lot of manual intervention.

Change-Id: Ib4b3e52e10557e803d603aa2b1ea5d826845a102
Reviewed-on: https://code.wireshark.org/review/261
Reviewed-by: Gerald Combs <gerald@wireshark.org>

[Automatic manuf, services and enterprise-numbers update for 2014-02-16]

Change-Id: Id8a7fe6a64184a121c945c8cd281863b96dd233e
Reviewed-on: https://code.wireshark.org/review/230
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Fix Bug 9728 'Lua: ProtoField.bool() VALUESTRING argument is not optional but was supposed to be'

Similar to bug 9725 and ProtoField.new(), the way the VALUESTRING argument is being checked
in the code for ProtoField.bool() ends up making it non-optional. This patch fixes that,
along with some minor API documentation fixes (text).

This is a backport for change-id Iadb9a8ace9c5514fc623d882301fe16b637fe4ce

Change-Id: Ic60375f3e0ad7c7a8887dce7ffbd946f0a9d80b5
Reviewed-on: https://code.wireshark.org/review/209
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Fix Bug 9725 'Lua: ProtoField.new() is buggy'

Using ProtoField.new() is dicey. Many of the optional arguments don't properly check the lua stack - they call lua_isnil() for their index number, instead of lua_gettop() to see the stack size. lua_isnil() may return false in such cases.

Change-Id: I83ca1e5fc34e71ec35899adbedabcee69571b9fe
Reviewed-on: https://code.wireshark.org/review/118
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-on: https://code.wireshark.org/review/207
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Fix the host entry.

Change-Id: Ia76b5585c38eebdec6c275c6e1aadabb3862cf2b
Reviewed-on: https://code.wireshark.org/review/172
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit bed30b8a94b645361a00d70ee2db0ec184cae103)
Reviewed-on: https://code.wireshark.org/review/174
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

[Automatic manuf, services and enterprise-numbers update for 2014-02-09]

Change-Id: Ia3c3a4e113028e601e074c7ae9005fb532089ecb
Reviewed-on: https://code.wireshark.org/review/152
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Fix bug 9720 'Lua: bitop library is missing in Lua 5.2'

In Lua 5.2 the bitop library is missing - it's not getting loaded into
the lua global table as "bit", or anything else for that matter. Lua
5.2 has its own bit-operations library ("bit32") which is there, but
that one's not as good as bitop and would break back/forward
compatibility for lua scripts anyway.

Change-Id: I94b7d45bbeb2f637d1c76b0b5c9d8472eebfcaea
Reviewed-on: https://code.wireshark.org/review/100
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-on: https://code.wireshark.org/review/141

Pass the caplen from the struct wtap_pkthdr to pcap_read_post_process().

That makes it clearer what the argument should be and, in the case of an
SPB, passes the correct length (the length *after* any pseudo-header we
convert to a union wtap_pseudo_header and remove from the raw packet
data we hand to our caller).

Change-Id: Ia360cd7c971ae1e1635bdef8f7e17a8d9e2495f8
Reviewed-on: https://code.wireshark.org/review/134
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Introduce end-of-line normalization

Change-Id: I543039935aec3715cf9887708ca74966fa106571
Reviewed-on: https://code.wireshark.org/review/115
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>

Fix dissection of GTP MM Context RAND field.

As suggested by Lükő Bálint to fix bug #9722.

Change-Id: Ie6b801a9660716c2c6efa6fd09b50a2481f5acd7
Reviewed-on: https://code.wireshark.org/review/110
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>

correct a typo in a filter string

svn path=/trunk/; revision=54687

Change-Id: Ie9ca9fbffdfe83b74f38ab314ba4403d2f17ee8e
Reviewed-on: https://code.wireshark.org/review/104
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>

Freom Dennis:

As I looked into the implementation in epan/dissectors/packet-ieee802a.c, there's a bug in the dissect_ieee802a(). After OUI and PID is parsed, it looks for the customized sub-dissector_table by
oui_info = (oui_info_t *)g_hash_table_lookup(oui_info_table, GUINT_TO_POINTER(oui))
The problem is that the oui is defined as an array (guint8 oui[3]), whose value contains the 3-byte customized OUI. However, here GUINT_TO_POINTER(oui) converts the local array oui's address to the hash table key, instead of the value. That cause the search in the hash table to fail, because the ieee802_add_oui() use the OUI value as the key.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9122

svn path=/trunk/; revision=51918

Conflicts:
epan/dissectors/packet-ieee802a.c

Change-Id: I659b8eee2bff74d8741d67546a1d7959fc40a113
Reviewed-on: https://code.wireshark.org/review/101
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>

[Automatic manuf, services and enterprise-numbers update for 2014-02-02]

Change-Id: I9e016b004a305d86521ebe6065fd7f6cc9805a89
Reviewed-on: https://code.wireshark.org/review/76
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>

Add gitreview file for master-1.10

Change-Id: I951f5ad9c121b63d1f075710b0f5e566516c5cca
Reviewed-on: https://code.wireshark.org/review/67
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>

Rewrote ProtoField_new to:
- Allow both string and integer for type and base (improve usability).
- Check valid base and mask for different types (avoid crashes).
- Remove ftypes.PROTOCOL from valid types.

This should fix bug #9549.

svn path=/trunk/; revision=54292

Conflicts:
epan/wslua/wslua_proto.c

Change-Id: I6e925933b178deb9784340e03d72a4252b498b9c