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>
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>
More SVN → Git conversion.

Change-Id: Iddb56a54befd187f87f7a250f1fb38c4d2cc59b2
Reviewed-on: https://code.wireshark.org/review/265
Reviewed-by: Gerald Combs <gerald@wireshark.org>
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
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>
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
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 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>
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
[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>
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>
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>
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>
"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>
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>
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>
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>
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>
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>
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>