Commit graph

15275 commits

Author SHA1 Message Date
Anders Broman
607d32b00d From David Ward: OSPF dissector: add filters for v3 LS Type field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7684
svn path=/trunk/; revision=44720
2012-09-01 07:42:07 +00:00
Anders Broman
de809cc9e3 From Chris Elston:
Added L2TPv3 control message authentication checking

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

svn path=/trunk/; revision=44711
2012-08-31 09:39:52 +00:00
Chris Maynard
3e976d69d1 tools/checkhf.pl reported 3 unused hf entries. Commented them out for now.
BTW:
tools/checkAPIs.pl reports 109 useless add_text()'s vs. 346 add_<something else>() calls (31.50%), under 50% threshhold, but not really that great.

tools/checkfiltername.pl reports 42 errors.

svn path=/trunk/; revision=44706
2012-08-30 20:36:53 +00:00
Jeff Morriss
3268b5b215 Remove trailing space in some hf names.
Add some hf names (some entries had only a space for a name).
Remove non-ASCII chars and C++/C99-style comments.

svn path=/trunk/; revision=44705
2012-08-30 20:22:09 +00:00
Pascal Quantin
fc83e532db Display hf_dns_rr_opt_client_addr as FT_BYTES
svn path=/trunk/; revision=44704
2012-08-30 19:13:38 +00:00
Anders Broman
e94d8a0b7e Add Japanese ISUP variant(not all IE's)
IE dissection code from Brian Mceniery.

svn path=/trunk/; revision=44703
2012-08-30 18:40:49 +00:00
Alexis La Goutte
a09f80e8be From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552
Add support for EDNS0 option from draft-vandergaast-edns-client-subnet-01

From me
* use/prefer proto_tree_add_item
* use switch() for optcode (may be there is other optcode later...)

svn path=/trunk/; revision=44702
2012-08-30 17:03:50 +00:00
Chris Maynard
733baac21e Fix Session ID parsing. Patch from Fransesco Fondelli via bug 6881.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6881

svn path=/trunk/; revision=44701
2012-08-30 15:23:54 +00:00
Pascal Quantin
0e79405e0d Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7679:
Do not try to set IR header length when the profile is unknown

svn path=/trunk/; revision=44700
2012-08-30 12:08:53 +00:00
Jakub Zawadzki
0e382b6668 Yet another case of bug #7316 (r42989) and bug #7668 (r44688)
Use correct field type for ccp.opt.oui

svn path=/trunk/; revision=44689
2012-08-28 09:10:34 +00:00
Jakub Zawadzki
d35ef03b15 Fix bug #7668
Use correct field type for lcp.opt.oui

svn path=/trunk/; revision=44688
2012-08-28 08:44:41 +00:00
Evan Huus
cb5a320d22 Fix a dead store and a few duplicate 'break' statements as caught by
clang and cppcheck.

svn path=/trunk/; revision=44687
2012-08-28 02:08:42 +00:00
Evan Huus
f3ca6e55ef Remove variadic macro that accidentally made it in a while back.
svn path=/trunk/; revision=44686
2012-08-28 02:01:25 +00:00
Bill Meier
99173bf797 Fix 2 memory leaks;
Essentially: 'fid' & 'fragment' hash tables can be global (i.e., need not be 'per call')
               thus removing g_malloc'd storage never freed because it was pointed to in
               se_alloc'd structs.

  Fixes Bug #4134: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4134

  Also: fix a compile error when compiling with '#define DEBUG_DESEGMENT'

svn path=/trunk/; revision=44685
2012-08-27 16:17:38 +00:00
Pascal Quantin
74a43c3ada Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7622 :
Fix dissection of a few TDS fields (line number in ERR and MSG token, user type in RESULTS token, row count in DONE token) when the TDS version is >= 7.2.
Add a mechanism to memorize the TDS 7.X version in the conversation based on the TDS version found in LOGIN ACK token. This version is used for dissection when a TDS version is not set in preferences (TDS protocol type set to "not specified").

svn path=/trunk/; revision=44684
2012-08-27 11:47:37 +00:00
Jörg Mayer
df49549abf Infrastructure for tcp decoding - nothing done to actually
decode the contents

svn path=/trunk/; revision=44683
2012-08-27 07:46:23 +00:00
Bill Meier
cbd2a8ff25 Fix two minor memory leaks.
svn path=/trunk/; revision=44682
2012-08-26 23:44:25 +00:00
Bill Meier
89c5e9796f Fix 'Warn Dissector bug, protocol IAX2, in packet 62: proto.c:4406: failed assertion "fixed_item->parent == tree"'
svn path=/trunk/; revision=44681
2012-08-26 23:24:27 +00:00
Anders Broman
2aa9312c14 From Ilarion Ishkulov Multisegment PDUs are not reassembled properly with TCP dissector https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7544
svn path=/trunk/; revision=44680
2012-08-26 16:39:11 +00:00
Jörg Mayer
15ee8b256a Extend a comment.
svn path=/trunk/; revision=44675
2012-08-26 03:17:53 +00:00
Pascal Quantin
1c76cb5fef From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
packet-gmr1_bcch: Add guards in the SI1/2 choice of segment

Although the CSN1 dissector itself will just stop if there is
no matching segment, it will leave the choice field uninitizalized
and so when we use it to fill some other text, it crashes ...

To protect against that, we put a last choice entry that will always
match. As a bonus, it triggers an explicit error in CSN so you
know something is wrong.

svn path=/trunk/; revision=44674
2012-08-25 21:31:29 +00:00
Pascal Quantin
f783da2d6d From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
packet-gmr1_bcch: Whitespaces fixes

svn path=/trunk/; revision=44673
2012-08-25 21:19:47 +00:00
Pascal Quantin
6c12a7ffdc From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
packet-gmr1_rr: Add support for "Assignment Command 1" messages

svn path=/trunk/; revision=44672
2012-08-25 21:16:08 +00:00
Pascal Quantin
88911f9102 From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
packet-gsmtap: Call GMR-1 RACH dissector when appropriate

svn path=/trunk/; revision=44671
2012-08-25 21:09:49 +00:00
Pascal Quantin
cd1ceaa04a From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7664 :
Add GMR-1 RACH dissection

svn path=/trunk/; revision=44670
2012-08-25 21:04:48 +00:00
Pascal Quantin
502b9b06c5 Update protocol name to match the changes done in r44661
svn path=/trunk/; revision=44668
2012-08-25 13:54:39 +00:00
Pascal Quantin
7da4784b25 Following r44648, revert part of r44162 and followups so as to have a top level gsm_a filter name
svn path=/trunk/; revision=44667
2012-08-25 13:32:41 +00:00
Bill Meier
5452b8a20c Extern (and use) extended value string instead of the associated value string array.
svn path=/trunk/; revision=44665
2012-08-25 01:20:32 +00:00
Michael Mann
030604ec29 cleanup g_malloc memory leaks
svn path=/trunk/; revision=44664
2012-08-25 00:55:46 +00:00
Bill Meier
2c32d31858 value_sring fixes;
- fix dup: use correct value for an entry (typo);
 - comment out 2nd entry of a dup pair: 2 cases

svn path=/trunk/; revision=44663
2012-08-25 00:54:04 +00:00
Michael Mann
c7cbfac88d cleanup some unnecessary g_malloc calls
svn path=/trunk/; revision=44662
2012-08-25 00:39:17 +00:00
Michael Mann
95d14df10a effectively revert r44161, having the display filters favor '.' over '_'
svn path=/trunk/; revision=44661
2012-08-24 23:27:24 +00:00
Bill Meier
478199f349 Replace dup value_string array entry with correct entry; (dup was typo)
svn path=/trunk/; revision=44657
2012-08-24 20:07:52 +00:00
Bill Meier
4794f67904 Allow extended value string binary search (istead of linear search): re-order value_srring array entries slightly.
svn path=/trunk/; revision=44656
2012-08-24 19:49:53 +00:00
Michael Mann
6f8f3fdd42 match display filter prefix for all filters
svn path=/trunk/; revision=44653
2012-08-24 02:48:36 +00:00
Michael Mann
49ae61370e Adding period to proto filter name for being part of the "diameter" grouping.
svn path=/trunk/; revision=44652
2012-08-24 02:17:42 +00:00
Michael Mann
4d80811c3e minor display filter field typos
svn path=/trunk/; revision=44651
2012-08-24 02:04:10 +00:00
Michael Mann
14f3f8c55a Add period separator for "base" proto filter name.
svn path=/trunk/; revision=44650
2012-08-24 02:02:22 +00:00
Jeff Morriss
64fa3d4036 Don't call dissect_custom_message() when it's not initialized.
svn path=/trunk/; revision=44646
2012-08-23 19:07:24 +00:00
Bill Meier
c591c6dd56 Comment out all but first value_string array entries with dup values:
kept: first dup since that's the one which would
       be found with a linear search.

svn path=/trunk/; revision=44642
2012-08-23 17:30:42 +00:00
Bill Meier
7cd408ebf4 Replace dup value (typo ?) with what seems to be the correct value.
svn path=/trunk/; revision=44640
2012-08-23 17:24:46 +00:00
Bill Meier
2c616e40af Fix incorrect value (typo) in value-string array.
svn path=/trunk/; revision=44639
2012-08-23 17:22:13 +00:00
Bill Meier
4922d9ed17 Comment out dups (many of which are marked "deprecated" in packet-x11-keysymdef.h)
svn path=/trunk/; revision=44638
2012-08-23 17:18:26 +00:00
Bill Meier
7641d97020 Cleanup: Whitespace and long lines;
Also: remove a few boilerplate comments.

svn path=/trunk/; revision=44637
2012-08-23 17:11:36 +00:00
Bill Meier
da57a45b8c value-string arrays - allow "direct" access: fix dup val & fill in a "gap".
svn path=/trunk/; revision=44636
2012-08-23 15:38:03 +00:00
Bill Meier
8753b28b5a Fix extended value-string linear search: Move out-of-order value-string array entry.
svn path=/trunk/; revision=44635
2012-08-23 12:53:36 +00:00
Bill Meier
98774f5734 Fix extended value-string linear search: remove 2 dups from value-string array.
svn path=/trunk/; revision=44634
2012-08-23 12:51:32 +00:00
Jörg Mayer
5c1392f035 Update spec link to version 2.1
svn path=/trunk/; revision=44627
2012-08-23 09:45:15 +00:00
Jörg Mayer
c35eb920fe Add comment where to find the specification
svn path=/trunk/; revision=44626
2012-08-23 09:40:08 +00:00
Jörg Mayer
96aa6f41fb Add link to version 1 specification.
Remote trailing whitespcace.

svn path=/trunk/; revision=44625
2012-08-23 09:31:57 +00:00
Guy Harris
e835108dda Get rid of unnecessary function pointer - just directly call the
function in the switch statement.  This keeps us from calling through an
uninitialized pointer for custome parameter numbers other than
LLRP_VENDOR_IMPINJ (as warned of by at least some compilers).

svn path=/trunk/; revision=44624
2012-08-23 04:45:56 +00:00
Evan Huus
272a95a9d6 From Martin Kupec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7658
Major enhancements to the LLRP dissector.

svn path=/trunk/; revision=44621
2012-08-23 03:03:54 +00:00
Guy Harris
c2a8aa2bee Put the state of flags in the hop_flags field into the summary line.
Note in the introductory comment what "LISP" refers to, for the benefit
of those of us who grew up thinking it stood for "LISt Processing".

svn path=/trunk/; revision=44617
2012-08-22 21:01:46 +00:00
Pascal Quantin
ae7d61bd1c Try to make Ubuntu buildbot happy
svn path=/trunk/; revision=44615
2012-08-22 20:15:54 +00:00
Martin Mathieson
7e88a07e71 proto_item_append_string() doesn't work this case, so stop using it.
I am tempted though to chage proto_item_append_string() just be like
proto_item_append_text() without the call to g_vsnprintf(), which is the
expensize part I was hoping to avoid.

svn path=/trunk/; revision=44614
2012-08-22 19:01:01 +00:00
Pascal Quantin
7210419f96 From Loránd Jakab via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7654:
Add features to the Locator/ID Separation Protocol (LISP) dissector

svn path=/trunk/; revision=44613
2012-08-22 16:37:41 +00:00
Anders Broman
2b905a1b6a Add French National parameter https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7656
svn path=/trunk/; revision=44612
2012-08-22 13:35:20 +00:00
Evan Huus
51fa4645a0 From Teguh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7657
Replace the last instance of gnutls_datum with gnutls_datum_t. The former
is deprecated, and the latter is already being used elsewhere in the file.

svn path=/trunk/; revision=44611
2012-08-22 00:53:13 +00:00
Martin Mathieson
d847bc85a5 Delete the ROHC from here as it is superceded by packet-rohc.c
svn path=/trunk/; revision=44610
2012-08-21 21:37:31 +00:00
Martin Mathieson
1470f4a6b7 Call proto_item_append_string() rather than proto_item_append_text()
when there are no specifiers.

svn path=/trunk/; revision=44609
2012-08-21 21:36:59 +00:00
Martin Mathieson
f6b1932a8a Use tvb_get_stringz() rather than tvb_get_const_stringz(). I know that
these strings will be in a single, contiguous tvb...

svn path=/trunk/; revision=44607
2012-08-21 17:17:53 +00:00
Martin Mathieson
973be664bb Use proto_item_append_string() rather than proto_item_append_text() with
%s.

svn path=/trunk/; revision=44606
2012-08-21 17:12:13 +00:00
Pascal Quantin
f2fbb79c49 Add dissection of locationInformation IE in Ericsson proprietary extension
svn path=/trunk/; revision=44605
2012-08-21 15:14:50 +00:00
Pascal Quantin
9f3c1253f7 Fix filter names for Ericsson proprietary extensions
svn path=/trunk/; revision=44604
2012-08-21 10:40:04 +00:00
Pascal Quantin
91a531739f Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7648 :
Add support for Ericsson proprietary extensions to GSM MAP dissector

svn path=/trunk/; revision=44603
2012-08-21 09:32:04 +00:00
Pascal Quantin
dfc983d9ce Remove unused hf_gsm_map_imsi_digits entry and fix filter name for hf_gsm_map_TBCD_digits (which is also used for IMEI, ASCI call reference, MS Group ID and MS Long Group ID on top of IMSI)
svn path=/trunk/; revision=44596
2012-08-20 12:47:47 +00:00
Pascal Quantin
45a25dbf9e Avoid defining 2 entries with incompatible types (FT_BYTES vs FT_NONE) and same filter
svn path=/trunk/; revision=44595
2012-08-20 09:28:01 +00:00
Sake Blok
66115d1200 Enhance the http dissector to correctly reassemble http
headers when the first tcp segment does not contain a
full line.


svn path=/trunk/; revision=44593
2012-08-19 23:52:37 +00:00
Anders Broman
22c537a5f9 Try to fix the buildbot
svn path=/trunk/; revision=44588
2012-08-19 21:08:54 +00:00
Pascal Quantin
c48bc11626 Apply the speed improvement from r44578 to 64bits variant and length determinant decoding.
Compute the buffer size so that it can contain the field name and the bit string display.

svn path=/trunk/; revision=44586
2012-08-19 18:15:20 +00:00
Martin Kaiser
85c1776429 highlight only the bytes that actually belong to the CAT
svn path=/trunk/; revision=44579
2012-08-19 12:53:13 +00:00
Martin Mathieson
55e386dd5d Calling g_strlcat() for every bit of a constrained integer was really
slow.  Track the index and write the characters directly (while still
carefully checking that we don't spill the buffer).

svn path=/trunk/; revision=44578
2012-08-19 03:55:51 +00:00
Martin Mathieson
053c3e7e24 Correct a number in a value_string.
Spotted in a profile that match_strval_ext() was calling
match_strval_linear() a lot (this value_string has 1476 entries - it was
epensive!).

Found error by adding temp debug to _match_strval_ext_init() - do we
ever expect the entries not to be in order?  Am wondering if the warning
should be committed.

svn path=/trunk/; revision=44576
2012-08-19 02:27:13 +00:00
Martin Mathieson
cc0130e809 Save time by not appending byte values to the SDU item if will be hidden anyway (as happens
when RLC dissector is called).

svn path=/trunk/; revision=44574
2012-08-19 01:56:39 +00:00
Michael Mann
6c0e747f61 use session allocated memory for rtp_add_address/srtp_add_address hash tables
svn path=/trunk/; revision=44571
2012-08-19 00:21:26 +00:00
Pascal Quantin
5bce9d0d7d Move deciphering routine in a function and adapt it for unacknowledged mode
svn path=/trunk/; revision=44568
2012-08-18 20:25:54 +00:00
Michael Mann
296871713f make hash key session scoped
cleanup g_snprintf

svn path=/trunk/; revision=44565
2012-08-18 19:22:22 +00:00
Michael Mann
493516fd6c Convert GString to emem_strbuf_t in packet-gadu-gadu.c
Required an additional function, ep_strbuf_append_unichar, in emem module

svn path=/trunk/; revision=44564
2012-08-18 19:20:31 +00:00
Guy Harris
ff6a33fdb4 Mark a parameter as unused.
Clean up indentation and get rid of trailing white space.

svn path=/trunk/; revision=44562
2012-08-18 06:53:39 +00:00
Guy Harris
549d81fe37 epan/dissectors/packet-ansi_map.c shouldn't be edited - it's generated
from the files in asn1/ansi_map.  Update packet-ansi_map-template.c to
reflect the use of session-scope-allocated data for the saved invoke
data, and regenerate the dissector - which means that
TransactionId_table_cleanup() still exists, and is still used, it just
frees only the hash table key, which is g_strdup()ed, not the value,
which is automatically freed when the session-scope-allocated data is
all freed.

svn path=/trunk/; revision=44561
2012-08-18 06:33:08 +00:00
Guy Harris
c3caa3ba4f epan/dissectors/packet-ansi_tcap.c shouldn't be edited - it's generated
from the files in asn1/ansi_tcap.  Update packet-ansi_tcap-template.c to
reflect the use of session-scope-allocated data for the saved invoke
data, and regenerate the dissector - which means that
TransactionId_table_cleanup() still exists, and is still used, it just
frees only the hash table key, which is g_strdup()ed, not the value,
which is automatically freed when the session-scope-allocated data is
all freed.

svn path=/trunk/; revision=44560
2012-08-18 06:20:32 +00:00
Michael Mann
14a6d40267 Use capture scoped memory for hash table functionality
svn path=/trunk/; revision=44559
2012-08-18 02:55:18 +00:00
Michael Mann
db98d944e5 Use capture scoped memory for hash table functionality
svn path=/trunk/; revision=44558
2012-08-18 02:54:06 +00:00
Ronnie Sahlberg
a6c45b0582 iSCSI: DATA-IN only contain LUN and TTT iff the A-bit is set
svn path=/trunk/; revision=44550
2012-08-17 03:51:43 +00:00
Bill Meier
98eab94319 Cleanup:
- remove/rework some 'if (tree)' usage so that:
  . col_...() not called under same;
  . dissection doesn't change depending upon same;
- simplify some code;
- use consistent indentation & whitespace formatting.

svn path=/trunk/; revision=44546
2012-08-16 23:52:27 +00:00
Bill Meier
a9bb084310 Fix (minor ?) memory leak;
General cleanup:
 - use expert...() instead of a 'printf()';
 - #include <stdio.h> only if debug enabled;
 - remove unneeded variable initializations;
 - localize some variables;
 - reformat hf[] entries;
 - use consistent whitespace formatting.

svn path=/trunk/; revision=44545
2012-08-16 19:58:29 +00:00
Bill Meier
1b8e41afab General cleanup of whitespace formatting.
svn path=/trunk/; revision=44543
2012-08-16 18:06:57 +00:00
Bill Meier
cf706ca547 From Stefan Metzmacher: Updates for the SMB2/3
This patches add some missing things for SMB2/3 and support for decryption
of SMB3 traffic

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

From me: Change an initializer from C99 to C89 style (since the
 Microsoft compiler doesn't support C99).

svn path=/trunk/; revision=44542
2012-08-16 17:03:07 +00:00
Bill Meier
832b999c2c - Don't call col...() under 'if (tree)';
- Move proto_reg_handoff...() to the end of the file;
- Remove some uneeded variable initialization;
- Use consistent indentation (e.g., no 4 space tabs) and whitespace formatting.

svn path=/trunk/; revision=44541
2012-08-16 15:53:39 +00:00
Michael Mann
3329b7f0a7 restore tvb_ensure_bytes_exist checks. There are better ways to do this, but for now, keep the buildbots happy.
Also some other cleanup noticed while trying to fix buildbot fuzz failure.

svn path=/trunk/; revision=44540
2012-08-16 13:58:12 +00:00
Bill Meier
9c7f4006c0 Add editor modelines;
Do minor whitespace reformatting.

svn path=/trunk/; revision=44539
2012-08-16 13:51:54 +00:00
Bill Meier
51cc4887d2 col_...() and expert...() fcns should not be under 'if (tree)';
'tab-width/tabstop/tabSize' in editor modelines should really always be 8;

svn path=/trunk/; revision=44538
2012-08-16 13:44:40 +00:00
Bill Meier
f3fe778851 'tab-width/tabstop/tabSize' in editor modelines should really always be 8;
Also:
- In one case #include <epan/prefs.h> not needed;
- Do some minor whitespace reformatting.

svn path=/trunk/; revision=44537
2012-08-16 13:17:48 +00:00
Pascal Quantin
12a705af47 Miscellaneous changes:
- move channel information before header dissection
- add channel information to TM and RLC Control PDUs
- take into account rlc information in rlc_is_ciphered function
- update function prototypes according to the coding rules used in packet-rlc.c

svn path=/trunk/; revision=44535
2012-08-15 21:45:32 +00:00
Pascal Quantin
e5b7968030 Fix some headers fields that were wrongly marked as 64 bits instead of 32 bits
svn path=/trunk/; revision=44533
2012-08-15 20:43:00 +00:00
Martin Kaiser
c6cf211ccf dissect ake_send_pairing_info message
svn path=/trunk/; revision=44528
2012-08-15 19:40:22 +00:00
Martin Kaiser
af9a518763 move hdcp2 dissector to a separate file
use hdcp2 for protocol name, info column and filter names

(actually, hdcp and hdcp2 have nothing in common -
 hdcp2 was a complete redesign to fix security issues in hdcp)


svn path=/trunk/; revision=44527
2012-08-15 19:22:05 +00:00
Martin Kaiser
168a40cb4d hdcp2: dissect ake_no_stored_km message
svn path=/trunk/; revision=44526
2012-08-15 18:58:07 +00:00
Michael Tüxen
91f65904c2 Recommit:
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44502
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44511
and do some whitespace cleanups while there.

svn path=/trunk/; revision=44522
2012-08-15 16:02:01 +00:00
Michael Mann
3d40a7b94f Updated MPLS dissectors display filters per checkfiltername.pl
Tried to provide consistency with MPLS dissector filter names

svn path=/trunk/; revision=44521
2012-08-15 15:52:27 +00:00