osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity
51480 commits 26 branches 0 tags 795 MiB
Commit graph

51480 commits

This branch
This branch
All branches
Author SHA1 Message Date
Guy Harris
e35ca75a68 It's one character, either + or -, hence ASCII. 
svn path=/trunk/; revision=54885
 2014-01-22 01:28:31 +00:00
Guy Harris
a75657bbd6 It's not a string, it's a byte array (bit array, really). 
Also, RFC 5035 isn't a complete ESS spec, it's an update to RFC 2634.

svn path=/trunk/; revision=54884
 2014-01-22 01:22:01 +00:00
Bill Meier
9c953985a1 Clean up whitespace: use consistent indentation, etc; 
Add editor modelines.

svn path=/trunk/; revision=54883
 2014-01-22 01:10:31 +00:00
Guy Harris
90d7c5f59b Don't write out packets that have a "captured length" bigger than we're 
willing to read or that's bigger than will fit in the file format;
instead, report an error.

For the "I can't write a packet of that type in that file type" error,
report the file type in question.

svn path=/trunk/; revision=54882
 2014-01-22 00:26:36 +00:00
Martin Kaiser
5c825d6a36 mp4 box type is always a 7bit ascii string 
svn path=/trunk/; revision=54881
 2014-01-21 22:16:05 +00:00
Guy Harris
ddb966fb2f The file's name has a lower-case "p" in "9p". 
svn path=/trunk/; revision=54880
 2014-01-21 20:13:40 +00:00
Guy Harris
87f4b376f1 Fix one half-changed tvb_get_string() call. 
svn path=/trunk/; revision=54879
 2014-01-21 20:13:17 +00:00
Guy Harris
4eb619b677 Always combine ENC_UTF_8 with ENC_NA. 
svn path=/trunk/; revision=54878
 2014-01-21 20:12:48 +00:00
Guy Harris
73598a7991 IA5 = ASCII. Use tvb_get_string_enc() with an explicit encoding, not 
tvb_get_string().

svn path=/trunk/; revision=54877
 2014-01-21 20:08:39 +00:00
Guy Harris
4b02416cc9 9p strings are, not surprisingly, encoded using UTF-8; replace 
tvb_get_string() calls with tvb_get_string_enc() calls explicitly
specifying UTF-8.

svn path=/trunk/; revision=54876
 2014-01-21 19:53:52 +00:00
Evan Huus
f4ab2b2b00 Harden nfs_name_snoop_add_name against various malformed inputs. Thanks to Moshe 
Kaplan for the report.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9672 and some
other cases in the same vein.

svn path=/trunk/; revision=54875
 2014-01-21 18:48:01 +00:00
Guy Harris
4d9475e4ef Get rid of tvb_get_faked_unicode() - tvb_get_string_enc() does the job 
better.

We don't need eventlog_get_unicode_string_length() in the eventlog
dissector, either - tvb_unicode_strsize() does the job just as well.

svn path=/trunk/; revision=54874
 2014-01-21 09:56:34 +00:00
Pascal Quantin
35d0d0f1ae From Igor Slepchin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9675 : 
RMT LCT dissector doesn't display 48-bit TOIs and TSIs properly

svn path=/trunk/; revision=54873
 2014-01-21 08:59:47 +00:00
Guy Harris
8f8eeb5dce Check the return of wtap_dump_close() even if we've gotten a read error; 
the only reason not to check it is if we've already gotten a write error
and another write error would be superfluous (either "you got two of the
same error" or "you got an I/O error *and* you ran out of disk
space/disk quota" is of limited interest).

Discard the return value of wtap_dump_close() in the case where we've
already gotten a write error, in the hopes of squelching a Coverity
warning.

svn path=/trunk/; revision=54872
 2014-01-21 08:50:35 +00:00
Bill Meier
0bc06ee3ab - Remove unneeded #includes; 
- "Once-only" test not needed in proto_reg_handoff..();
- Set COL_PROTOCOL, clear COL_INFO at the begining of the dissector
   before fetching data from the tvb;
- Use tvb_reported_length;
- Use col_set_str/col_append_str where appropriate;
- Zigbee --> lwm;
- Fix typo;
- Reformat some whitespace for consistency.

ToDo:
- Review use of col_...() and expert...() under 'if (tree)';
- Review use of col_clear(..., COL_INFO) after text already added to COL_INFO;
- Review certain tvb fetches to ensure  no fetches using a negative offset;

svn path=/trunk/; revision=54871
 2014-01-21 02:32:48 +00:00
Guy Harris
45d5b74219 Fix declaration of tvb_get_string(). 
svn path=/trunk/; revision=54870
 2014-01-21 01:44:58 +00:00
Bill Meier
c540e33c49 Add properties .... 
svn path=/trunk/; revision=54869
 2014-01-21 01:24:13 +00:00
Guy Harris
9cdf8dd5f5 Don't do the byte-with-8th-bit-set-to-REPLACEMENT-CHARACTER mapping for 
UTF-8 strings.

Add that mapping for null-terminated ASCII strings.

Factor out some common parts of comments about string routines, and
clean up some other comments.

svn path=/trunk/; revision=54868
 2014-01-21 01:23:29 +00:00
Martin Kaiser
6517e3ba4b don't use tvb_get_string(..., len) to get exactly len raw bytes 
from a tvbuff

svn path=/trunk/; revision=54867
 2014-01-20 23:30:01 +00:00
Martin Kaiser
ae82a1cafe make MMI strings filterable 
svn path=/trunk/; revision=54866
 2014-01-20 22:06:19 +00:00
Martin Kaiser
26701ed0f7 remove todo comments 
svn path=/trunk/; revision=54865
 2014-01-20 21:56:38 +00:00
Martin Kaiser
933e95c8ec tvb_get_string(): replace 8bit characters with the unicode replacement char 
svn path=/trunk/; revision=54864
 2014-01-20 21:39:00 +00:00
Guy Harris
1d27123ab1 Longs are not guaranteed to be 64-bit. Use G_GINT64_MODIFIER to format 
64-bit quantities.

svn path=/trunk/; revision=54863
 2014-01-20 21:37:32 +00:00
Anders Broman
3a96d94c50 From Michal Labedzki: 
Bluetooth/Ubertooth: Improvements: Support for new btsnoop format, almost finished btle and minor fixes.

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

svn path=/trunk/; revision=54862
 2014-01-20 20:36:42 +00:00
Anders Broman
5fc0904093 packet-bootp.c: In function 'dissect_vendor_generic_suboption': 
packet-bootp.c:3293: warning: unused parameter 'pinfo'
packet-bootp.c:3293: warning: unused parameter 'v_ti'
packet-bootp.c:3294: warning: unused parameter 'optend'

svn path=/trunk/; revision=54861
 2014-01-20 20:30:41 +00:00
Anders Broman
f0fb43a621 From alexeyv: 
Add decryption for resumed TLS sessions with a session ticket.

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

svn path=/trunk/; revision=54860
 2014-01-20 20:26:04 +00:00
Anders Broman
6402d8590e Add generic dissection of unknown vendor sub options. 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9594

svn path=/trunk/; revision=54859
 2014-01-20 20:03:49 +00:00
Evan Huus
77e4a2f09c Fix 32/64 casting and add a note where the loss of precision might actually be a 
problem for 32-bit platforms.

svn path=/trunk/; revision=54858
 2014-01-20 19:32:43 +00:00
Evan Huus
f5931c7559 From Pavel Moravec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9612 
AMQP 1.0 Dissector

svn path=/trunk/; revision=54857
 2014-01-20 19:13:42 +00:00
Alexis La Goutte
d2410336b8 From Lubos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9638 
New Dissector For Lightweight Mesh protocol

A dissector for ATMEL Lightweight Mesh protocol (lwm).
The protocol is carried on the top of 802.15.4 frame.

From me:
* Add Modelines info
* Fix indent (use 4 spaces)
* Remove trailing whitespace

svn path=/trunk/; revision=54856
 2014-01-20 18:35:45 +00:00
Alexis La Goutte
c80e021e6f Add modelines info 
svn path=/trunk/; revision=54855
 2014-01-20 09:42:52 +00:00
Alexis La Goutte
fdee928692 Fix indent (use 4 spaces) and remove trailing whitespace 
svn path=/trunk/; revision=54854
 2014-01-20 09:42:45 +00:00
Alexis La Goutte
663ddb38d2 Fix build with CMake (Missing tap_export_pdu in ui/CMakeLists.txt 
svn path=/trunk/; revision=54853
 2014-01-20 07:53:42 +00:00
Alexis La Goutte
18d3a7010f Fix typo (only need one comma) 
svn path=/trunk/; revision=54852
 2014-01-20 07:53:00 +00:00
Anders Broman
072cce1ee1 From Abdul Hannan Khan: 
Correct AVP flags.

svn path=/trunk/; revision=54851
 2014-01-20 06:59:10 +00:00
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