aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-02-14Remove $Id$ and other Subversion leftovers from the doc files.Jeff Morriss23-54/+0
Change-Id: I28a376f7e0fd90971f65ae9c1105a3ec85221470 Reviewed-on: https://code.wireshark.org/review/204 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-13Don't complain if files don't have $Id$ in them.Jeff Morriss1-7/+0
$Id$ is pretty useless in git so don't enforce it in our source code. Change-Id: Ie8b1b9627aabbca72c9c1dd93a9a76901e6967eb Reviewed-on: https://code.wireshark.org/review/203 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-13Lua: add ability for scripts loaded from command-line to be passed argumentsHadriel Kaplan6-6/+126
This change adds the ability to pass on to lua scripts loaded from the command-line (tshark or wireshark) additional arguments supplied by the command-line. This will help us in our testsuites, but also might be useful for user-created scripts. The additional arguments are passed in using the '-X' eXtension switch. Change-Id: Ib94cdf1ffd194ca84692fee7816665e4ff95efbd Reviewed-on: https://code.wireshark.org/review/156 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-02-13Redesign of BGP ext-com in a separate function, alignement with RFC and ↵Matthieu Texier1-334/+744
IANA, use of items instead of add_text Change-Id: I4af2ee8e760aa80eeb28f71e93f8948ef5b26eb5 Reviewed-on: https://code.wireshark.org/review/95 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-02-13Enable SCTP reassembly by default.Jeff Morriss1-1/+1
This was suggested in: http://ask.wireshark.org/questions/29660/sctp-protocols-in-frame-problem Since desegmentation is enabled by default in TCP, it makes sense to me to do the same in SCTP as well. Change-Id: I3cb4c7900c600d21668d95003149f87b9a006f66 Reviewed-on: https://code.wireshark.org/review/200 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-13Powerlink: New heuristic payload dissectionRoland Knall1-37/+38
Up until now, the heuristic dissector for epl allways passed the complete epl frame. Therefore a lot of information got passed, which was not needed, resulting in subdissectors to have to call the epl dissector again, if the epl data had to be dissected. This patch adds a second heuristic dissector (not breaking the way, the existing one is working), which only passes the payload of the epl frame to a sub-dissector, therefore reducing memory overhead and increasing dissection speed. Upd: Changes according to comments in patchset Change-Id: I2ef309310f421f24d96dd1c188e188ccfa5935cd Reviewed-on: https://code.wireshark.org/review/190 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-13Try to get rid of the big ugly revision history table border.Gerald Combs1-1/+1
Change-Id: Id9505660dd020285be63d2ba17cf34a46aa6084f Reviewed-on: https://code.wireshark.org/review/201 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-13Expand gtpv2_srvcc_cause_vals with new values from TS 29.280 V11.5.0AndersBroman1-3/+10
and fix up the msg names. Change-Id: If2cc51a99bc236e840fea274d32989a5fe96aa29 Reviewed-on: https://code.wireshark.org/review/199 Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Anders Broman <a.broman58@gmail.com>
2014-02-13About box: make sure we read AUTHORS-SHORT as UTF-8.Gerald Combs1-0/+5
Use the application monospace font for the "Authors" and "License" tabs similar to the GTK+ UI. Change-Id: Ibca481562d7a9957ce603441c1e98b564e5bf389 Reviewed-on: https://code.wireshark.org/review/194 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-13Add application/pidf-diff+xmlAndersBroman1-0/+1
Change-Id: I15e4fc59181d9d8fa8dd363cbe4219e21c82f4a9 Reviewed-on: https://code.wireshark.org/review/197 Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Anders Broman <a.broman58@gmail.com>
2014-02-13From Michael LumAndersBroman1-14/+113
Header dissection for EVRC-NW2K https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9691 Change-Id: Id068aff15079a199e6ae91e2de65a957bd034ac4 Reviewed-on: https://code.wireshark.org/review/196 Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Anders Broman <a.broman58@gmail.com>
2014-02-12Add message type from RFC5416 : Section 3 : IEEE 802.11 Specific CAPWAP ↵Alexis La Goutte1-3/+6
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>
2014-02-12Add support of SIP subprotocol for WebSocketAlexis La Goutte1-0/+7
RFC 7118: The WebSocket Protocol as a Transport for the Session Initiation Protocol (SIP) No yet support of auto-detect subprotocol (via Sec-WebSocket-Protocol) Change-Id: I16e8ddd37002b3982673bd4a4a7b15f6200a4d85 Reviewed-on: https://code.wireshark.org/review/192 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-02-12Add support for two AVPs newly defined in RFC 6786Yasuyuki Tanaka1-1/+5
- Encryption-Encap AVP (AVP code 12) - Encryption-Algorithm AVP (AVP code 13) Change-Id: I9a4245b526bc59c2ffa228ce46c80ce3250ef0b6 Reviewed-on: https://code.wireshark.org/review/189 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-12Fix nmake buildEvan Huus1-1/+1
Change-Id: I5583e3c01aa40e07d153f57d72eff92766a755df Reviewed-on: https://code.wireshark.org/review/185 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-12Add correct license headers for reedsolomon code.Evan Huus2-12/+48
I got in contact with the original author (thanks to Didier for digging up his current email address) and verified that we could license this under the GPLv2+. Licensecheck finally passes! Change-Id: I6660ef9a961626bbc4dad53e8bf767b5b9e0b3fa Reviewed-on: https://code.wireshark.org/review/183 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-12RTP: Add support for SBC codec in RTP PlayerMichal Labedzki17-252/+598
Add optional dependancy to libsbc to play Bluetooth SBC in A2DP payload. Also simplify RTP Player and extent codec interface. Change-Id: I52e1fce9c82e2885736354fe73c6c37168a4fda3 Reviewed-on: https://code.wireshark.org/review/19 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-11Comment out the .asciidoc → .xml rule for now.Gerald Combs1-14/+14
Change-Id: I174fdb875030e10cee641e936d3fa9a7e66a23b2 Reviewed-on: https://code.wireshark.org/review/181 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-11Update new protocols listPascal Quantin1-3/+19
Change-Id: I960f857d59230e88bf8042148e5c8cec86d81161 Reviewed-on: https://code.wireshark.org/review/182 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-11Try to fix dist. Change the .asciidoc.xml inference rule to a patternGerald Combs2-4/+4
rule specific to wsug_src similar to the nmake change in gedc06c1. Change-Id: I6d4bffc5391bd84a83fca8acb6a3688805e05de6 Reviewed-on: https://code.wireshark.org/review/179 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-11Fix crash when doing "tshark -2 -r file -w newfile".Guy Harris1-4/+5
We were using cf->buf in some places and a local variable buf in others; consistenly use the local variable. Have a local variable for the struct wtap_pkthdr while we're at it; with some work we may be able to get rid of the struct wtap_pkthdr and the Buffer in the capture_file structure. Change-Id: I4762e22e11ef576be6bf9015450d1a270dd3d16b Reviewed-on: https://code.wireshark.org/review/178 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-11Fix a Qt version comparison.Gerald Combs1-2/+2
Change-Id: I7df90d53a2d8f29042994bd0c2bc7bf4450fab10 Reviewed-on: https://code.wireshark.org/review/177 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-11Make sure the .asciidoc.xml inference rule only applies to the wsug_srcGerald Combs1-2/+2
directory. This keeps us from trying to clobber GPL_appendix.xml if GPL_appendix.asciidoc has a more recent timestamp. Change-Id: I37962c7a6c5357709a4dd269340c333673d44539 Reviewed-on: https://code.wireshark.org/review/176 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-11Statistics->Flow Graph in qtshark crashes with a segfaultDavid Ameiss1-5/+10
What appears to be happening is SequenceDiagram::draw() is iterating over the stored seq_analysis_item_t elements - but at the same time SequenceDialog::fillDiagram() is running - which destroys the old seq_analysis_info_t (which SequenceDiagram has stored a copy of and is referencing items in the list) then reloads it. I'll attach a patch to SequenceDialog::fillDiagram() which fixes the problem - essentially calling sequence_analysis_list_get() with a new seq_analysis_info_t, calling SequenceDialog::setData() with the new one, then destroying the current seq_analysis_info_t and replacing it with the new on Change-Id: I14f7b5dc64018ba5b81fe8d874a701e021401859 Closed-bug:9506 Reviewed-on: https://code.wireshark.org/review/175 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-11Finish converting the Developer's Guide to AsciiDoc.Gerald Combs14-235/+542
Add developer-guide-docinfo.xml, which lets us carry over DocBook front matter. Remove the meta_info chapter. Most of its contents are now in developer-guide-docinfo.xml. Add a DocBook revision history based on hints from the Git/SVN/CVS revision history. Comment out or note makefile content that's no longer necessary for converting the Developer's Guide but will be useful for converting the User's Guide. Fix building the release notes with CMake. Other minor changes. Tested with Autotools, nmake, and CMake. Change-Id: Ib6d50c821ca906fff50a84ad4d6af3212ebdff0a Reviewed-on: https://code.wireshark.org/review/155 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-11Fix the host entry.Gerald Combs1-1/+1
Change-Id: Ia76b5585c38eebdec6c275c6e1aadabb3862cf2b Reviewed-on: https://code.wireshark.org/review/172 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-11Add expert info about skipped notify IP addressPeter Lemenkov1-2/+5
- Add expert info about skipped notify IP address - Add a couple of comments (cosmetic) Change-Id: I6caa904cf16b304724c5da1933531cf865daf619 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> Reviewed-on: https://code.wireshark.org/review/171 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-10Fix warnings in packet-parlay.cAlexis La Goutte2-2/+2
packet-parlay.c:53643:9: warning: passing argument 2 of 'get_CDR_wchar' from incompatible pointer type [enabled by default] packet-parlay.c:53667:9: warning: passing argument 2 of 'get_CDR_wstring' from incompatible pointer type [enabled by default] Change-Id: I027809139e74b563e759f28e2e141951166e53d0 Reviewed-on: https://code.wireshark.org/review/170 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Anders Broman <a.broman58@gmail.com>
2014-02-10Fix indent (Use 4 spaces and modelines info)Alexis La Goutte1-66/+64
Change-Id: I1cae6fd52f84a4d2f101357adddfda010da847e0 Reviewed-on: https://code.wireshark.org/review/168 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-10Fix indent (Use 4 spaces and modelines info)Alexis La Goutte1-317/+330
Change-Id: I833b6f33a66ab911fd0c5f5ce4e35f590918f85f Reviewed-on: https://code.wireshark.org/review/167 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-10Fix indent (use 4 spaces and modelines info)Alexis La Goutte1-86/+99
Change-Id: Ib5c57a8302ca065233dd7d827605f8dc333d220c Reviewed-on: https://code.wireshark.org/review/166 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-10Fix indent (use 4 spaces and modelines info)Alexis La Goutte1-228/+240
Change-Id: Iace874e7ccb5a3b8d0429f4627e6137abe8fbf21 Reviewed-on: https://code.wireshark.org/review/169 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-10Fix indent (Use 4 spaces and modelines info)Alexis La Goutte1-0/+12
Change-Id: If816b474634dd72ad75931e8803ba1bdfb6b1143 Reviewed-on: https://code.wireshark.org/review/165 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-10Enable DTLS "Decrypting" of all the NULL cipher suites. PreviouslyDavid Tapuska1-3/+34
it only did the RSA MD5/SHA1 ones. Change-Id: I7b16c7245dd1646f68479095540a8bef191d5fb2 Reviewed-on: https://code.wireshark.org/review/160 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-10Qt 5.2.1 for Mac has QtMacExtras but not QMacNativeToolBar.Gerald Combs1-2/+2
Change-Id: I55e68a7fd84d36b50e6084cd82b51df7c91c6476 Reviewed-on: https://code.wireshark.org/review/159 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-10VP8 RTP: fix Windows build failurePascal Quantin1-27/+24
Fix Windows build errors: packet-vp8.c(179) : error C2220: warning treated as error - no 'object' file generated packet-vp8.c(179) : warning C4101: 'vp8_payload_tree' : unreferenced local variable packet-vp8.c(291) : warning C4101: 'ti' : unreferenced local variable packet-vp8.c(599) : warning C4101: 'vp8_name_handle' : unreferenced local variable While we are at it, remove useless _U_ modifiers and NULL assignments. Change-Id: I3d28de7f27a8019cc5424dafc4264107742d7c86 Reviewed-on: https://code.wireshark.org/review/158 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-10Use IP types instead of plain strings where possiblePeter Lemenkov1-45/+84
Change-Id: Ia4a78e1ef3a7c45761cc271ecc17e7868b8456d9 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> Reviewed-on: https://code.wireshark.org/review/157 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-10VP8 RTP dissectorOwen Williams3-0/+615
Change-Id: Ic21d13bf8ca77ff37c2d2d229c4e8c9d8f053677 Reviewed-on: https://code.wireshark.org/review/124 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-09Add test suite for Lua dissector-related functionsHadriel Kaplan4-1/+698
This isn't super-fancy, but it runs a simple protocol dissector and verifies the tshark output matches what it expects. Things like Proto, ProtoField, Field, Tvb, TvbRange, etc., are used in an example dissector script - it dissects DNS... partially. Enough to make sure things aren't fundamentally broken. This provides something to add on top of later as well. Change-Id: Icf3c8e9534944bcf4c4f6150f02a9a43f999cd75 Reviewed-on: https://code.wireshark.org/review/126 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-09[Automatic manuf, services and enterprise-numbers update for 2014-02-09]Gerald Combs4-21/+248
Change-Id: I8ca5845c85a086cd88af5b95bb9fee09e9b05850 Reviewed-on: https://code.wireshark.org/review/151 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-09Fix bug 9736 'Lua: new Int64/UInt64 functions don't prevent division by zero'Hadriel Kaplan3-39/+108
OK, in all fairness this does a bit more than just fix that bug. It also adds a 'Int64()' and 'UInt64()' __call metamethods. I generally dislike using __call metamethods, because they're often unintuitive (for example the wireshark Field and FielInfo use this in a bizarre fashion). But this happens to be a perfect use for it, and very natural, imho. Another change is to make the metatables of classes visible to scripts. There was never really a good reason not to make them visible, and they have to be visible to do things like use __call on a plain table... not to mention I need them to be visible to run test scripts verifying evrything is kosher. I also updated the test suite to test for the div/mod by zero. Change-Id: Ia4c594c8f59d4e799090716bd032ba2815df032f Reviewed-on: https://code.wireshark.org/review/149 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-09Fix Bug 6489 to stop compiler warning on gcrypt deprecated delcarationsHadriel Kaplan1-3/+3
The libgcrypt library has several deprecated functions exported, that we don't use. Unfortunately the GCC compiler warns about these deprecated functions regardless, which is quite annoying. This commit makes clang/gcc ignore the deprecated attribute, for gcrypt.h only. The danger with this is if gcrypt ever deprecates a function we actually *use*, then we won't see the warning. So I'm not sure if it's a good or bad idea to do this change, but it's really annoying to see the warnings and makes finding real warnings difficult. Change-Id: I03e80a6e7e4833ce0f709088c9ab4af98193db3d Reviewed-on: https://code.wireshark.org/review/128 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-02-08Licensecheck improvements, just two errors left.Evan Huus6-19/+116
Spawned from https://www.wireshark.org/lists/wireshark-dev/201402/msg00024.html Add some ignore rules for files that can't/shouldn't include a license header. Reorganize some ignore rules to group rules with similar motivations. Add a header to autogen.sh and attribute it to just "The Wireshark Authors" since while Gilbert wrote the original version it's gone through so many changes over the years that sorting out proper authorship is unnecessarily complex. Add headers to Graeme Hewson's two files as verified by private email, and update his address in the AUTHORS file per his request. Add header to one of Ulf Lamping's files, as verified by private email. Only remaining problem is the reedsolomon code. Change-Id: Ifb7de8c4b4d79012553e29d459a0145d39f51df5 Reviewed-on: https://code.wireshark.org/review/145 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-08Fix typo about encoding in MIP6 dissector...Alexis La Goutte1-1/+1
Change-Id: Id0b50ddacf2e3cae008590456316586d262e6029 Reviewed-on: https://code.wireshark.org/review/146 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-08Fix some typo in MIP6 dissectorAlexis La Goutte1-54/+67
Fix indent (use 4 spaces) Add modelines info Fix warning found by fix encoding args tools Change-Id: I4de8e3c0729c550eeceddd8e1a67fb6aa063844a Reviewed-on: https://code.wireshark.org/review/144 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-08Fix bug 9733 ' Lua: wtap_filetypes.TSPREC_ variable names are missing from ↵Hadriel Kaplan1-1/+2
the Lua global table' The fix for bug 9712, which involved changing the make-init-lua.pl perl script to handle the new C-code define names for filetypes in release 1.11, unfortunately also stopped matching against the timestamp define names. Arguably the timestamp ones should never have been matched to begin with, at least not by the same regex function, because they're not "filetypes". But they've been matched and exported into the Lua table forever, so we'll break backward-compat if we don't keep doing it. Ugh. The good news is I caught this bug using a new test script I wrote which verifies previous release's Lua stuff didn't disappear. I'll submit that separately when I get a chance to clean it up, hopefully next week. Change-Id: Ibf1d1da0dc4ed62cc1bacf345742dccf8ec40e30 Reviewed-on: https://code.wireshark.org/review/143 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-08Have macros to handle the range check and byte swapping.Guy Harris1-56/+44
Combine the check for whether the field is within the packet data and the swapping of the field into macros that do both, and use them. Change-Id: I1db4c5fd76172edd44abc9fb111d79a2537c6c9d Reviewed-on: https://code.wireshark.org/review/130 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-08Fix bug 9732: ' Lua: recent commit changed some MENU_ key names in init.lua'Hadriel Kaplan3-2/+23
A recent fix (made by me) for bug 9707, in Change-Id: If4ee1906aa60dd37366cf2ef9bc4168e0ea024b6, made the perl regex grab too much of the menu name. It changed MENU_STAT_CONVERSATION, MENU_STAT_RESPONSE, and MENU_ANALYZE_CONVERSATION's key names into their longer C-code names. Ugh. The fix for this is a bit brittle, but I think it's impractical to avoid it being brittle, due to needing to support legacy Lua scripts. I put comments in stat_menu.h to warn of the danger. Change-Id: I41408e9d4f5b5bd73e2871fccabff81c7cbd242d Reviewed-on: https://code.wireshark.org/review/140 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-08"origin" appears to be a safer bet than "@{upstream}".Gerald Combs1-2/+2
Change-Id: Icd00c62d9b908771bf2b73b8e5b49d519570ff8b Reviewed-on: https://code.wireshark.org/review/142 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs36-179/+191
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. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>