aboutsummaryrefslogtreecommitdiffstats
path: root/tools
AgeCommit message (Collapse)AuthorFilesLines
2014-02-25Install git instead of subversion.Jeff Morriss1-1/+1
Change-Id: I5da2c129fa120e461d4bb3199c1ec0e0b52c28a4 Reviewed-on: https://code.wireshark.org/review/337 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-25"tools" updates.Gerald Combs3-354/+3
Remove backport-change. It didn't work as well as I had hoped. Remove backport-rev since we don't use Subversion any more. Remove DocBook code from gen-bugnote. Change-Id: I70f39444c6cdd380301691f64d27147ac09e5cae Reviewed-on: https://code.wireshark.org/review/348 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-22TVB API deprecations and cleanupEvan Huus1-6/+15
- rename tvb_length and similar to tvb_captured_length and similar; leave #defines in place for backwards-compat, but mark them clearly as deprecated in code comments and in checkAPI - remove tvb_get_string as C code and just leave a #define in place for backwards-compat; mark it clearly as deprecated in code comment and checkAPI - update READMEs and sample dissector for all of the above - while in the neighbourhood, make checkAPI skip (and warn) for missing files instead of bailing on the whole check, so subsequent files still get checked Change-Id: I32fc437896ca86ca73e9b49d5f50400adf8ec5ad Reviewed-on: https://code.wireshark.org/review/311 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-20Enhance pre-commit tools to avoid false positiveAlexis La Goutte1-1/+1
Limit check to file with extension *.c or *.h Change-Id: I6e237e6fd053083d271924120973a6b07e2d4e53 Reviewed-on: https://code.wireshark.org/review/247 Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-18Fix indent (use tabs)Alexis La Goutte1-16/+16
Change-Id: I45f5e2ed64090947f1605db10eb6cee0e33782bf Reviewed-on: https://code.wireshark.org/review/248 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-14Remove $Id$ and other Subversion leftovers from the tools.Jeff Morriss55-137/+3
There are a few things in here which could still use attention. Don't regenerate anything now. Change-Id: I283c224d3523212144707fca3d6265916cb11792 Reviewed-on: https://code.wireshark.org/review/205 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-10Fix warnings in packet-parlay.cAlexis La Goutte1-1/+1
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-08Licensecheck improvements, just two errors left.Evan Huus1-10/+35
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-07Replace "svn" with "git" all over the place.Gerald Combs1-1/+1
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>
2014-02-04asn2wrs: Rewrite relative paths in header.Stig Bjørlykke1-3/+4
Change both absolute paths and relative paths generated outside source directory to paths relative to asn1/<proto> subdir. Change-Id: I867d3a31c687b08347b11336ce69fc70db2d7c7b Reviewed-on: https://code.wireshark.org/review/88 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-02-03Don't use newer shell features, as we now just use /bin/sh.Guy Harris1-4/+9
/bin/sh in Solaris 10, for example, doesn't understand "${OS#Windows}", so using /bin/sh broke the Solaris build on the buildbot. Use a case statement instead. Change-Id: Icdec74599c339e19ef6ffc7728f4ae2d5cf98999 Reviewed-on: https://code.wireshark.org/review/96 Reviewed-by: Guy Harris <guy@alum.mit.edu> Tested-by: Guy Harris <guy@alum.mit.edu>
2014-02-02Fix build on FreeBSD 10.0Edwin Groothuis1-1/+1
Change-Id: I6be0d2dfe3b44f166233b1dd20ef02c10a024f97 Reviewed-on: https://code.wireshark.org/review/74 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-01-24Give valgrind fuzzing a bit more time. Otherwise we have some large (~80MB)Evan Huus1-2/+3
captures in the menagerie which time out even under normal circumstances. svn path=/trunk/; revision=54941
2014-01-19Fix two coverity messages:Jörg Mayer1-5/+3
*** CID 718534: Dereference before null check (REVERSE_INULL) /tools/lemon/lemon.c: 3425 in translate_code() 3419 rp->rhs[i]->index,i-rp->nrhs+1); 3420 }else{ 3421 /* No destructor defined for this term */ 3422 } 3423 } 3424 } >>> CID 718534: Dereference before null check (REVERSE_INULL) >>> Null-checking "rp->code" suggests that it may be null, but it has already been +dereferenced on all paths leading to the check. 3425 if( rp->code ){ 3426 cp = append_str(0,0,0,0); 3427 rp->code = Strsafe(cp?cp:""); 3428 } 3429 } 3430 *** CID 1156989: Out-of-bounds read (OVERRUN) /tools/lemon/lemon.c: 3139 in tplt_xfer() 3133 int i, iStart; 3134 char line[LINESIZE]; 3135 while( fgets(line,LINESIZE,in) && (line[0]!='%' || line[1]!='%') ){ 3136 (*lineno)++; 3137 iStart = 0; 3138 if( name ){ >>> CID 1156989: Out-of-bounds read (OVERRUN) >>> Overrunning array "line" of 1000 bytes at byte offset 1000 using index "i" +(which evaluates to 1000). 3139 for(i=0; line[i] && i<LINESIZE; i++){ 3140 if( line[i]=='P' && i<(LINESIZE-5) && strncmp(&line[i],"Parse",5)==0 3141 && (i==0 || !safe_isalpha(line[i-1])) 3142 ){ 3143 if( i>iStart ) fprintf(out,"%.*s",i-iStart,&line[iStart]); 3144 fprintf(out,"%s",name); svn path=/trunk/; revision=54849
2014-01-18Add environment checks. Add a topic to our refspec.Gerald Combs1-3/+23
Check for a 'gerrit' remote and for a commit-msg hook. The hook script doesn't work on my system. This might be due to http://code.google.com/p/gerrit/issues/detail?id=843 svn path=/trunk/; revision=54838
2014-01-16If you use bashisms it means you're a bash script.Gerald Combs1-1/+1
svn path=/trunk/; revision=54829
2014-01-16More Chocolatey lex/yacc updates.Gerald Combs1-1/+8
Add Windows-style path handling to runlex.sh. Update the example Chocolatey LEX path accordingly. This lets us use path information in LEX and have it work in both nmake and runlex.sh Add a FindChocolatey.cmake module. Update FindLEX and FindYACC to use it. The code is currently untested and commented out. svn path=/trunk/; revision=54828
2014-01-16Allow the use of Win flex-bison and document how to do that.Gerald Combs1-1/+1
svn path=/trunk/; revision=54824
2014-01-13Document {CODE,HEADER} {START,END}.Guy Harris1-1/+9
Clean up indentation. svn path=/trunk/; revision=54721
2014-01-13Add HEADER START and HEADER END, similar to CODE START and CODE END, toGuy Harris2-5/+57
allow stuff to be put into the .h file; that way, if you put helper functions into the .c file, for use by dissectors other than the one being generated, you can put declarations for them into the .h file. Do some checks for mis-nesting of CODE and HEADER blocks. Clean up the "this is generated code" header. svn path=/trunk/; revision=54720
2014-01-13Squelch some warnings.Guy Harris1-2/+2
svn path=/trunk/; revision=54711
2014-01-10Update the enterprise-numbers URL.Gerald Combs1-1/+1
svn path=/trunk/; revision=54694
2013-12-29The IEEE OUI, IAB, and OUI-36 lists currently redirect toGerald Combs1-8/+28
http://standards.ieee.org/regauthmaint.html, which says IEEE Registration Authority Services will be unavailable from Friday, December 27th through Monday, December 30th As a result the manuf file got clobbered. Revert the manuf file to its non-clobbered state and add sanity checks to make-manuf. Add a note about the impending addition of OUI-28. svn path=/trunk/; revision=54485
2013-12-27Generate prototype for plugin_reg_handoff()Jakub Zawadzki1-0/+2
This should fix warnings: plugin.c:XX:1: warning: no previous prototype for 'plugin_reg_handoff' [-Wmissing-prototypes] svn path=/trunk/; revision=54475
2013-12-27Fix [-Wmissing-prototypes]Anders Broman1-0/+1
svn path=/trunk/; revision=54473
2013-12-21Commit sample program to generate charsets.c tables using iconv()Jakub Zawadzki1-0/+126
For now only single-byte, and it must be possible to encode whole charset as UCS-2 svn path=/trunk/; revision=54324
2013-12-20Change G_GINT64_CONSTANT(xxxxU) to G_GUINT64_CONSTANT(xxxx)Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=54314
2013-12-19proto_tree_add_text -> proto_tree_add_xxx conversion.Michael Mann1-0/+3
svn path=/trunk/; revision=54274
2013-12-19Some patches from Peter Harris:Jeff Morriss1-19/+105
[PATCH 1/5] X11 dissector: Sort declarations This prevents pointless changes showing up in the diff when evaluating unrelated changes to the generator. See http://search.cpan.org/dist/perl-5.18.0/pod/perldelta.pod#Hash_randomization [PATCH 2/5] X11 dissector: Silence warnings on perl 5.18, prevent 5.20 Perl 5.18 retroactively marked "given/when" experimental, with a promise to remove or dramatically change it in 5.20. Since there is no perl 5.20 yet, there is no way to make this script compatible with it. [PATCH 3/5] X11 dissector: Support variable_param (at least for glCallLists) (This patch makes the change in r54232 unnecessary by using the previously- unused variable.) [PATCH 4/5] X11 dissector: Remove obsolete TODO item This item was done in r53531 PATCH 09/11 svn path=/trunk/; revision=54242
2013-12-18Some proto_tree_add_xxx functions have a '_' in the function name so make ↵Michael Mann1-1/+1
sure they get counted in the proto_tree_add_text percentage. Makes a few dissectors look a little better. svn path=/trunk/; revision=54236
2013-12-18Instead of assigning a variable to itself, avoid unused warnings similarGerald Combs1-1/+1
to the Q_UNUSED macro. svn path=/trunk/; revision=54232
2013-12-18Fix [-Wmissing-prototypes]Anders Broman1-0/+1
svn path=/trunk/; revision=54209
2013-12-13Change the exit status of a fuzz failure to 255 so that if you use it with xargsEvan Huus1-1/+1
the failures don't get suppressed. svn path=/trunk/; revision=54071
2013-12-13Switch the cherry-pick merge strategy to "recursive + theirs", whichGerald Combs1-1/+4
seems to pull in fewer changes and be less prone to conflitcs. This was the case for r53086, at least. Add "-x" which adds a "cherry picked from..." line to the commit message. Show a diff before pushing. svn path=/trunk/; revision=54007
2013-12-13Fix redirection.Gerald Combs1-1/+1
svn path=/trunk/; revision=54003
2013-12-13Don't cherry-pick if we have changes.Gerald Combs1-0/+6
svn path=/trunk/; revision=54001
2013-12-12Add a "backport-change" script which cherry-picks a proposed backportGerald Combs2-1/+142
and pushes it to Gerrit. svn path=/trunk/; revision=53999
2013-12-04Ply parser updated to 3.5 (from GitHub github.com/dabeaz/ply)Tomas Kukosa2-119/+179
svn path=/trunk/; revision=53782
2013-12-04From Anders request Add prototype for corba/idl dissectorAlexis La Goutte1-0/+17
svn path=/trunk/; revision=53778
2013-12-03Dissectors should not use dfilter.h, don't include it.Jakub Zawadzki1-0/+1
XXX ncp2222 dissector is using dfilter_compile(), why? svn path=/trunk/; revision=53766
2013-12-03Add modelines info to idl generate fileAlexis La Goutte1-2/+36
svn path=/trunk/; revision=53754
2013-12-03Fix indent for generated file (Use 4 space)Alexis La Goutte1-39/+39
svn path=/trunk/; revision=53753
2013-12-03Fix generator don't generate trailing whitespaceAlexis La Goutte1-4/+6
svn path=/trunk/; revision=53752
2013-12-03Remove trailing whitespace and add modelines infoAlexis La Goutte1-44/+46
svn path=/trunk/; revision=53751
2013-12-03Remove whitespace and add modelines infoAlexis La Goutte1-2/+12
svn path=/trunk/; revision=53750
2013-12-03Add #pragma to idl generator...Alexis La Goutte1-1/+5
svn path=/trunk/; revision=53746
2013-12-01Use 4-space (PEP 8) indentation. Add modelines.Gerald Combs5-443/+501
svn path=/trunk/; revision=53685
2013-12-01Use indentation recommended by PEP 8.Gerald Combs1-126/+125
svn path=/trunk/; revision=53684
2013-12-01Fix compatibility with Python 2.5. Tested with 2.5, 2.6, 2.7, and 3.3.Gerald Combs1-3/+4
svn path=/trunk/; revision=53683