osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
46,772 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

46772 Commits

Author SHA1 Message Date
Sake Blok 56cb987ef2 Fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7546 
Make sure unresolved columns are indeed unresolved


svn path=/trunk/; revision=49776
 2013-06-04 21:36:47 +00:00
Pascal Quantin 1bb2081fd2 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8746 : 
Add procedure numbers to C12.22 dissection

svn path=/trunk/; revision=49775
 2013-06-04 20:21:17 +00:00
Anders Broman 3bfeaff546 Add subdissection of: 
- SNMPv2-MIB sysDescr
-  SNMPv2-MIB::sysName

svn path=/trunk/; revision=49774
 2013-06-04 20:05:16 +00:00
Jakub Zawadzki 6bd6c5eed9 Add new dfilter function: size() 
Make it return fvalue_length() of field.

[XXX, rename len() to strlen(), and size() to len()?!]

svn path=/trunk/; revision=49771
 2013-06-04 19:29:10 +00:00
Chris Maynard 8df372bb6a Fix warning reported by MSVC: 
to_str.c(262) : warning C4114: same type qualifier used more than once

svn path=/trunk/; revision=49770
 2013-06-04 19:12:32 +00:00
Jakub Zawadzki efb83216f3 Change two arrays of pointer to strings, to array of characters. Save some space. 
svn path=/trunk/; revision=49767
 2013-06-04 18:13:09 +00:00
Gerald Combs 8b4b8154a4 The CommDlg_OpenSave_GetFilePath macro fetches the path+name of the most 
recently selected file in the current file dialog. This isn't the proper
routine to use when trying to figure out the save/export file name. We
have to dig through the OPENFILENAME struct instead. Fixes bug 8224.

#Backport 1.10

svn path=/trunk/; revision=49765
 2013-06-04 18:07:59 +00:00
Tomas Kukosa fd5c1ddf5c Allow C directives in #.FN_HDR, #.FN_FTR, #.FN_BODY, they have to start with ## 
svn path=/trunk/; revision=49763
 2013-06-04 14:07:36 +00:00
Pascal Quantin f37f79b107 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8747 : 
Remove padding characters from CBS page content display

svn path=/trunk/; revision=49756
 2013-06-04 07:09:42 +00:00
Anders Broman 78e334b845 From Mike Garratt: 
Friendly Names support causing unnecessary delay when Wireshark starts.

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

svn path=/trunk/; revision=49752
 2013-06-04 04:36:19 +00:00
Anders Broman ee109cc7b2 From Anthony Coddington: 
show_fragment_seq_tree does not add reassembled data tree item

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

svn path=/trunk/; revision=49751
 2013-06-04 04:23:20 +00:00
Anders Broman 94ff9552c2 From Anthony Coddington: 
SDH dissector calculation fixes.

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

svn path=/trunk/; revision=49750
 2013-06-04 04:19:52 +00:00
Anders Broman 4cdb591e46 From Anthony Coddington: 
ERF wiretap export multiple extension header fix.

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

svn path=/trunk/; revision=49749
 2013-06-04 04:00:59 +00:00
Jeff Morriss 779d28d390 Fix the fuzz failure reported (by me) in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8764 : 
Apply the fix from bug 8539 (r48796) to another function (dissect_r3_upstreamcommand_queryconfig()):

Bail out of the item length we get (which we use to increment the offset) is 0.
Otherwise the offset does not advance and we loop forever.

While we're in there: get the item length just once (there's no need to call
tvb_get_guint8() a half dozen times when one will do).

svn path=/trunk/; revision=49744
 2013-06-04 02:01:53 +00:00
Jeff Morriss 29d51623c2 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8762 : 
Remove dead code (condition can never happen).

svn path=/trunk/; revision=49743
 2013-06-04 01:38:53 +00:00
Jeff Morriss d8558f06fd Fix an unintialized-value-used warning that Valgrind detected in the capture 
file attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8760 :

When searching for a signature, don't search past the end of the record.

svn path=/trunk/; revision=49742
 2013-06-04 01:31:56 +00:00
Jeff Morriss 9f95423783 Get rid of trailing white space and a few tabs. 
svn path=/trunk/; revision=49741
 2013-06-04 00:58:40 +00:00
Jeff Morriss 0eecced808 Fix the wiretap fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8760 : 
Check that the record length we got out of the file is at least as big as
stats block trailer; if not, declare the file bad.

svn path=/trunk/; revision=49739
 2013-06-04 00:50:05 +00:00
Evan Huus e129b4aa03 From William Sims via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8755 
The entity offset variable parameter uses either offset or orientation but not
both, this caused the data displayed to be skewed.

svn path=/trunk/; revision=49736
 2013-06-03 23:47:23 +00:00
Evan Huus 05eab3a2e6 From Marko Hrastovec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8737 
Add dissection of Category 009 to the ASTERIX dissector.

svn path=/trunk/; revision=49734
 2013-06-03 23:27:01 +00:00
Guy Harris e4d65e993f file_skip() only needs to return a Boolean; if anybody cares what the 
seek offset is after calling it, they can use file_tell().  (Some
routines were already assuming it returned a gboolean.)

svn path=/trunk/; revision=49733
 2013-06-03 23:07:42 +00:00
Jeff Morriss 838e3767ce From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8707 : 
As suggested by Jakub, don't use strlen() when g_string->len will do.

From me:

Don't assume that just because we "got_val" that the value has a length.
Checking it first eliminates this warning from Valgrind:

==11954== Invalid read of size 1
==11954==    at 0x61D1466: read_prefs_file (prefs.c:3012)
==11954==    by 0x61D1841: read_prefs (prefs.c:2955)
==11954==    by 0x409901: main (tshark.c:1137)
==11954==  Address 0xc05244f is 1 bytes before a block of size 16 alloc'd
==11954==    at 0x4A08A6E: realloc (vg_replace_malloc.c:662)
==11954==    by 0x3CF8C4D736: g_realloc (in /usr/lib64/libglib-2.0.so.0.3400.2)
==11954==    by 0x3CF8C66226: ??? (in /usr/lib64/libglib-2.0.so.0.3400.2)
==11954==    by 0x3CF8C66ACE: g_string_insert_c (in /usr/lib64/libglib-2.0.so.0.3400.2)
==11954==    by 0x61D1566: read_prefs_file (gstring.h:139)
==11954==    by 0x61D1841: read_prefs (prefs.c:2955)
==11954==    by 0x409901: main (tshark.c:1137)

svn path=/trunk/; revision=49731
 2013-06-03 22:07:21 +00:00
Martin Kaiser 9475131092 From chen li 
handle list ending delimiter in bt-dth peer list

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

svn path=/trunk/; revision=49729
 2013-06-03 21:01:43 +00:00
Martin Kaiser a5bfcbf2a9 rename expert module to expert_iso7816 
remove unnecessary comma

svn path=/trunk/; revision=49728
 2013-06-03 20:35:53 +00:00
Chris Maynard 27872a9324 Apply the same tooltip for the text entry as for the updated label tooltip in r49726, but with a typo fix: "thefield" -> "the field". 
svn path=/trunk/; revision=49727
 2013-06-03 20:34:50 +00:00
Gerald Combs a0823d82c9 Custom columns are specified using display filter field names, not 
display filters.

svn path=/trunk/; revision=49726
 2013-06-03 20:01:15 +00:00
Anders Broman f9fb8329f3 From Tommy Wu: 
Update 3GPP2 AVP:s.

svn path=/trunk/; revision=49725
 2013-06-03 18:34:25 +00:00
Pascal Quantin 4adcd51676 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8739 : 
Move offset to end of line without assuming that we always have \r\n at the end of it

svn path=/trunk/; revision=49722
 2013-06-03 17:55:20 +00:00
Alexis La Goutte 7397620985 Enhance CERT DNS Type 
svn path=/trunk/; revision=49720
 2013-06-03 13:11:12 +00:00
Alexis La Goutte c2657de3e9 Enhance KX DNS Type 
(and fix a minor bug.. KX Preference is always = 0...)

svn path=/trunk/; revision=49719
 2013-06-03 13:11:02 +00:00
Alexis La Goutte 8d26213a1f Enhance NXT DNS Type 
svn path=/trunk/; revision=49718
 2013-06-03 13:10:53 +00:00
Alexis La Goutte 86dee256ab Enhance NSEC DNS Type 
svn path=/trunk/; revision=49717
 2013-06-03 13:10:39 +00:00
Alexis La Goutte 3aa62793e8 Enhance LOC DNS Type 
svn path=/trunk/; revision=49716
 2013-06-03 13:10:31 +00:00
Alexis La Goutte a02411f679 Enhance DNAME DNS Type 
svn path=/trunk/; revision=49715
 2013-06-03 13:10:22 +00:00
Alexis La Goutte aceab71d28 Enhance A6 DNS Type 
svn path=/trunk/; revision=49714
 2013-06-03 13:10:12 +00:00
Alexis La Goutte ddf5186981 Enhance AAAA DNS Type 
svn path=/trunk/; revision=49713
 2013-06-03 13:10:02 +00:00
Alexis La Goutte 7e11edaa43 Enhance IPSECKEY DNS Type 
svn path=/trunk/; revision=49712
 2013-06-03 13:09:53 +00:00
Alexis La Goutte 87a5f44fa4 Enhance KEY Type 
svn path=/trunk/; revision=49711
 2013-06-03 13:09:43 +00:00
Pascal Quantin 8c32b5db74 Initialize the whole hdr_info structure to please gcc 4.3.2 
svn path=/trunk/; revision=49710
 2013-06-03 07:48:59 +00:00
Guy Harris 8c112f9223 Put back a fix that earlier checkins lost. 
svn path=/trunk/; revision=49709
 2013-06-03 06:36:55 +00:00
Anders Broman 5e408534c8 cc1: warnings being treated as errors 
../../asn1/nbap/packet-nbap-template.c: In function 'add_hsdsch_bind':
../../asn1/nbap/packet-nbap-template.c:349: warning: unused parameter 'tree'

svn path=/trunk/; revision=49708
 2013-06-03 04:25:31 +00:00
Michael Mann 7fe5422c4b Convert ASN.1 dissectors to use filterable expert info. 
NOTE: Kerberos ASN.1 template was updated, but not generated to source.

svn path=/trunk/; revision=49707
 2013-06-03 03:42:36 +00:00
Guy Harris a28cbb7c8a Put a space between "because" and the next word. 
svn path=/trunk/; revision=49706
 2013-06-03 02:08:13 +00:00
Evan Huus 45ed7d6aa3 Initialize some variables that GCC 4.7 complains about. I'm not 100% sure 
that the complaints are valid, or that simply zeroing them is the right fix
if they are, but at least it builds now. Should we be erroring if we don't
see a sliceLength header?

svn path=/trunk/; revision=49705
 2013-06-03 01:07:26 +00:00
Guy Harris c20b5d96a8 When reading sequentially, skip past any ignored data at the end of the 
packet.

svn path=/trunk/; revision=49704
 2013-06-03 00:26:16 +00:00
Guy Harris c3c6f93f5c Pass the read_rec_data routines a wtap_pkthdr pointer, and have them 
fill in that structure, so that it's filled in by both the read and
seek-read routines.

svn path=/trunk/; revision=49703
 2013-06-02 23:32:17 +00:00
Guy Harris 761ab82280 Pull the code to Fill in the wtap_pkthdr structure into a common 
routine, and use it in both the read and seek-read routines.

svn path=/trunk/; revision=49702
 2013-06-02 23:23:47 +00:00
Guy Harris f7f029c255 Move code to fill in the wtap_pkthdr into peektagged_process_header(), 
so that it's filled in by both the read and seek-read routines.

svn path=/trunk/; revision=49701
 2013-06-02 23:20:11 +00:00
Guy Harris bc97838985 Pull code to read and process packet headers into 
peekclassic_process_record_header_() routines, used in both the read and
seek-read routines.

svn path=/trunk/; revision=49700
 2013-06-02 23:12:58 +00:00
Guy Harris fb2cb6c9a8 Pull code to read process packet headers into a 
packetlogger_process_header() routine, used in both the read and
seek-read routines.

svn path=/trunk/; revision=49699
 2013-06-02 22:17:37 +00:00