Anders Broman
e45896cafc
Split the GUI and the tap part to make it possible to adapt to Qt.
...
svn path=/trunk/; revision=54850
2014-01-20 05:51:10 +00:00
Jörg Mayer
a8002aa0b7
Fix two coverity messages:
...
*** 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-19 17:59:20 +00:00
Martin Kaiser
a0df200a84
coverity 702387
...
add missing NULL check
svn path=/trunk/; revision=54848
2014-01-19 16:19:24 +00:00
Martin Kaiser
f544e0812a
coverity 281214
...
check the return value of strtok() before passing it to strtoul()
(can't be triggered in practice as dumpcap never sends a NULL string)
svn path=/trunk/; revision=54847
2014-01-19 16:06:45 +00:00
Gerald Combs
bb5051e85a
[Automatic manuf, services and enterprise-numbers update for 2014-01-19]
...
svn path=/trunk/; revision=54844
2014-01-19 15:03:43 +00:00
Anders Broman
95ed1b4977
As spotted by Joerg; make a HFILL_INIT(hf) macro and use it to init the private part of the hf structure.
...
svn path=/trunk/; revision=54843
2014-01-19 09:40:04 +00:00
Jörg Mayer
113c6d5f55
Fix a typo
...
svn path=/trunk/; revision=54842
2014-01-19 02:18:24 +00:00
Jörg Mayer
88a205d5e6
Error doesn't exist, use warning instead.
...
svn path=/trunk/; revision=54841
2014-01-19 01:08:52 +00:00
Jörg Mayer
2a21b01fbb
Add option to specify special permissions for dumpcap during cmake phase:
...
set(DUMPCAP_INSTALL_OPTION <val>)
where val is one of "normal" "suid" "capabilities"
Some things left to do:
- Error out in cmake if setcap isn't found or libcap isn't found.
- Move multivalue option handling into it's own macro (-file) with
value checking
svn path=/trunk/; revision=54840
2014-01-19 00:48:22 +00:00
Jörg Mayer
5783452ab2
-Warray-bounds was listed twice
...
svn path=/trunk/; revision=54839
2014-01-18 22:52:56 +00:00
Gerald Combs
8424cf3f8c
Add environment checks. Add a topic to our refspec.
...
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-18 00:03:02 +00:00
Pascal Quantin
6429497015
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9649 :
...
SMPP: source_telematics_id value length is 1 byte
svn path=/trunk/; revision=54837
2014-01-17 22:18:50 +00:00
Pascal Quantin
f63d80c2e4
From Fabio Tarabelloni via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9650 :
...
ZigBee ZCL Appliance Identification: fix endianness of Company ID, Brand ID and Product Type ID
svn path=/trunk/; revision=54836
2014-01-17 21:52:55 +00:00
Martin Kaiser
c852f994ea
From Toralf Förster
...
fix format strings for signed integers
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9637
svn path=/trunk/; revision=54835
2014-01-17 20:06:39 +00:00
Anders Broman
90ea235292
Fix [-Wmissing-prototypes]
...
svn path=/trunk/; revision=54834
2014-01-17 19:35:57 +00:00
Anders Broman
43595fa3f0
Fix [-Wmissing-prototypes]
...
svn path=/trunk/; revision=54833
2014-01-17 19:21:41 +00:00
Anders Broman
493ba3e367
Try to fix warning: initializer element is not computable at load time.
...
svn path=/trunk/; revision=54832
2014-01-17 18:58:50 +00:00
Anders Broman
a49fee443b
Fix a bug intrduced in http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=54820
...
svn path=/trunk/; revision=54831
2014-01-17 18:55:49 +00:00
Gerald Combs
7649011c91
Apply layouts in Qt Creator. Fix a tooltip.
...
Change-Id: I02759cb83ef970395a80acaafb9a28c630000000
2014-01-17 09:33:45 -08:00
Gerald Combs
fae3157f04
Look for win_flex and win_bison.
...
svn path=/trunk/; revision=54830
2014-01-16 20:15:20 +00:00
Gerald Combs
705083d279
If you use bashisms it means you're a bash script.
...
svn path=/trunk/; revision=54829
2014-01-16 19:42:13 +00:00
Gerald Combs
8db4bc2499
More Chocolatey lex/yacc updates.
...
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-16 18:57:29 +00:00
Martin Mathieson
62249477b6
Remove #include and make the situation with snow3g clearer in a comment. May need further removal, depending upon concensus on wireshark-dev
...
svn path=/trunk/; revision=54827
2014-01-16 12:02:30 +00:00
Anders Broman
8c608ca3d1
Fix [-Wmissing-prototypes]
...
svn path=/trunk/; revision=54826
2014-01-16 07:30:22 +00:00
Gerald Combs
bce9eaad75
Partially revert r54824.
...
svn path=/trunk/; revision=54825
2014-01-16 02:23:42 +00:00
Gerald Combs
d5b706be51
Allow the use of Win flex-bison and document how to do that.
...
svn path=/trunk/; revision=54824
2014-01-16 01:28:02 +00:00
Evan Huus
60045cae1c
Implement basic support for SPXII decoding (at least we get the payload offsets
...
right now).
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9552
svn path=/trunk/; revision=54823
2014-01-15 23:56:41 +00:00
Evan Huus
1c6679c5ec
Dissect SPXII flag bits.
...
First part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9552
svn path=/trunk/; revision=54822
2014-01-15 23:09:36 +00:00
Evan Huus
622d9cb953
Add modelines and fix one indentation issue.
...
svn path=/trunk/; revision=54821
2014-01-15 23:00:07 +00:00
Anders Broman
efbecb3e9a
Fix a couple of
...
warning: initializer element is not computable at load time
svn path=/trunk/; revision=54820
2014-01-15 19:29:03 +00:00
Evan Huus
3f6502079a
Add captype and tfshark binaries to .gitignore
...
svn path=/trunk/; revision=54819
2014-01-15 18:06:57 +00:00
Guy Harris
9374ede4ff
Don't cast away constness.
...
svn path=/trunk/; revision=54818
2014-01-15 08:38:14 +00:00
Guy Harris
2f0ddb96d0
Fun and games with const.
...
svn path=/trunk/; revision=54817
2014-01-15 08:36:09 +00:00
Guy Harris
9228c72ef0
Explain casting away const.
...
svn path=/trunk/; revision=54816
2014-01-15 08:35:55 +00:00
Anders Broman
1f8d2e25d2
Update to version V12.3.0 (2013-12).
...
svn path=/trunk/; revision=54815
2014-01-15 07:13:23 +00:00
Guy Harris
d15a6d0add
Don't cast away constness.
...
svn path=/trunk/; revision=54814
2014-01-15 03:37:06 +00:00
Guy Harris
ada9dafdf0
Don't cast away constness.
...
svn path=/trunk/; revision=54813
2014-01-15 03:35:44 +00:00
Evan Huus
dae86605b6
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
2014-01-15 02:09:11 +00:00
Guy Harris
61867d0b2f
Eliminate fvalue_set() in favor of routines that take arguments
...
appropriate for particular FT_ types. This lets us do some more type
checking and lets us use const pointers when appropriate.
Constify a bunch of stuff, and don't cast away constness.
svn path=/trunk/; revision=54811
2014-01-15 01:05:03 +00:00
Gerald Combs
04b18f44c1
Make it more clear that we're faking a git description for now.
...
svn path=/trunk/; revision=54810
2014-01-15 00:52:27 +00:00
Gerald Combs
d7e93e99c7
Copy over recent changes from trunk-1.8 along with some local
...
modifications.
------------------------------------------------------------------------
r54807 | gerald | 2014-01-14 16:35:34 -0800 (Tue, 14 Jan 2014) | 2 lines
Start using the output of 'git describe'.
------------------------------------------------------------------------
r54805 | gerald | 2014-01-14 15:38:16 -0800 (Tue, 14 Jan 2014) | 2 lines
Start adding support for plain git.
------------------------------------------------------------------------
svn path=/trunk/; revision=54809
2014-01-15 00:51:38 +00:00
Alexis La Goutte
62aef67720
Fix typo (Direcly => Directly)
...
svn path=/trunk/; revision=54804
2014-01-14 20:48:30 +00:00
Alexis La Goutte
4ed44704d2
Add filetap/abi* to .gitignore
...
svn path=/trunk/; revision=54803
2014-01-14 20:37:23 +00:00
Guy Harris
32da185ed5
Don't cast away constness.
...
svn path=/trunk/; revision=54802
2014-01-14 18:42:54 +00:00
Guy Harris
a48d06df11
We have to cast away constness here, because C doesn't have
...
parameterized types.
svn path=/trunk/; revision=54801
2014-01-14 18:42:16 +00:00
Guy Harris
f862fc40ba
Don't cast away constness.
...
svn path=/trunk/; revision=54800
2014-01-14 18:35:36 +00:00
Guy Harris
d99e0b13d4
Regenerate ANSI TCAP dissector from the changes in r54499.
...
svn path=/trunk/; revision=54799
2014-01-14 18:34:01 +00:00
Guy Harris
afc159eaf3
Don't cast away constness.
...
svn path=/trunk/; revision=54798
2014-01-14 18:19:31 +00:00
Guy Harris
11220f625c
Don't cast away constness.
...
svn path=/trunk/; revision=54797
2014-01-14 18:16:12 +00:00
Guy Harris
834c79a07e
Don't cast away constness.
...
svn path=/trunk/; revision=54796
2014-01-14 18:12:14 +00:00