Commit Graph

13922 Commits

Author SHA1 Message Date
Jeff Morriss 336adde8df Use ENC_NA too
svn path=/trunk/; revision=34679
2010-10-28 16:54:04 +00:00
Jeff Morriss 772edf8fb5 Use ENC_BIG_ENDIAN and ENC_LITTLE_ENDIAN
svn path=/trunk/; revision=34677
2010-10-28 16:46:38 +00:00
Anders Broman fe71cbcc99 From Pascal Quantin:
[NAS EPS] Fix TFT decoding in case of "delete packet filters from existing TFT" operation

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

svn path=/trunk/; revision=34666
2010-10-28 15:06:48 +00:00
Jaap Keuter e942385e06 From Matt Parrisimo:
Calculate packet length and checksum.

svn path=/trunk/; revision=34664
2010-10-27 21:11:46 +00:00
Jeff Morriss 505fbf012a Fix the disssector assertion reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3877 :
The rest of the code assumes that sip can be NULL, so don't assert when it's
not.

Also make fid_cmp() static since it's only used in this module.

svn path=/trunk/; revision=34663
2010-10-27 21:08:49 +00:00
Jeff Morriss 4a120508d6 Fix the reassembly assertion reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3881 :
Ensure the fragment bytes exist before passing them to the reassembly code.

svn path=/trunk/; revision=34662
2010-10-27 18:26:54 +00:00
Stig Bjørlykke 321188339e Added two new functions: nstime_diff() and nstime_subtract().
svn path=/trunk/; revision=34660
2010-10-27 07:44:26 +00:00
Jaap Keuter b4d195f256 Try to decode the unknown multipart subtype anyway.
svn path=/trunk/; revision=34659
2010-10-27 06:49:39 +00:00
Jaap Keuter 3db66ff53e Try to decode the unknown multipart subtype anyway.
svn path=/trunk/; revision=34658
2010-10-27 06:49:18 +00:00
Jaap Keuter b67c9b05cb Supply an entry to use for unknown multipart subtype.
svn path=/trunk/; revision=34657
2010-10-27 06:48:39 +00:00
Anders Broman f8ba652b62 From Fred Fierling:
Found a bug in the changes from sizeof -> numeric.

svn path=/trunk/; revision=34656
2010-10-27 05:30:01 +00:00
Jeff Morriss 710a96470f If we get a syntax error reading the preferences file, tell which preference we were reading when we got the error.
svn path=/trunk/; revision=34655
2010-10-27 01:43:24 +00:00
Jeff Morriss 945d917122 From Thomas Boehne via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5324 :
As mentioned before, the heuristics used by packet-adwin-config were weak for
UDP packets. This patch creates a stronger heuristic by checking if one of the
MAC addresses in the UDP packets is in the range assigned to the manufacturer
of the devices that use this protocol (or if it is a broadcast).

That should be relatively safe to do because the protocol is rarely used in
routed networks.

svn path=/trunk/; revision=34654
2010-10-27 00:42:02 +00:00
Anders Broman 758ee054ab Follow up on:
You may not use g_int64_hash() or g_int64_equal(), as they are not  present in the minimum version of GLib that we support.  Create a  ieee802154_long_addr structure for long addresses, create hash  routines for those addresses, and use them.

Export and use those routines.

svn path=/trunk/; revision=34653
2010-10-26 12:43:40 +00:00
Anders Broman fbb65b97b6 - Get rid of check_col and sizeof
svn path=/trunk/; revision=34652
2010-10-26 11:26:28 +00:00
Guy Harris 0f96301a3e You may not use g_int64_hash() or g_int64_equal(), as they are not
present in the minimum version of GLib that we support.  Create a
ieee802154_long_addr structure for long addresses, create hash
routines for those addresses, and use them.

svn path=/trunk/; revision=34651
2010-10-26 08:31:16 +00:00
Anders Broman a3eff92edc g_int64_hash is first available in Glib 2.22 (This needs a proper fixr) This is just to get the build going again.
svn path=/trunk/; revision=34650
2010-10-26 07:38:22 +00:00
Anders Broman 30d27cfb05 g_int64_hash is first available in Glib 2.22
(This needs a proper fixr)
This is just to get the build going again.

svn path=/trunk/; revision=34649
2010-10-26 06:48:09 +00:00
Anders Broman 809984a493 Try to fix the build
svn path=/trunk/; revision=34648
2010-10-26 06:13:42 +00:00
Anders Broman 26f0f7bc7a From Fred Fierling:
Multi-key Support and Extended Address Mapping for ZigBee Dissectors
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331

svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
Anders Broman 161076b23b Minor cleanup, use proto_add_item().
svn path=/trunk/; revision=34646
2010-10-25 20:13:00 +00:00
Jeff Morriss f7b3c16320 From Pascal Quantin: don't accept packets unless they're over TCP or UDP.
svn path=/trunk/; revision=34644
2010-10-25 17:17:52 +00:00
Bill Meier 1b01709034 Change "4 space tabs" to spaces.
svn path=/trunk/; revision=34643
2010-10-25 16:43:48 +00:00
Bill Meier a8de0b1f76 From Jouni Malinen: preliminary version of Wi-Fi P2P (Wi-Fi Direct) dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5196

From me: Add packet-wifi-p2p.h to Makefile.common DISSECTOR_INCLUDES
         Add dissectors/packet-wifi-p2p.c to epan/CMakelists.txt

svn path=/trunk/; revision=34642
2010-10-25 16:40:45 +00:00
Jeff Morriss 36390c306f From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5336 :
Attached patch:
1. Adds port 5985 as a HTTP traffic port (used by MS Powershell remoting over
HTTP)
2. Adds dissection of Kerberos authentication to HTTP.


svn path=/trunk/; revision=34641
2010-10-25 02:17:41 +00:00
Jeff Morriss 0f93035b15 From Thomas Boehne via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5324 :
The company I work for uses two proprietary protocols, for which I initially
developed  wireshark plugins. Now we would like to integrate them into the
public wireshark repository. 

I followed the READMEs and converted the plugins into a static dissectors. I
cleaned up the code until checkAPI.pl was silent, translated all terms to
english and ran randpkt and fuzz-testing for a long time. All that I found was
a bug in a different dissector.

From me:
- Fold the header files into the dissectors
- Clean up some memory leaks
- Strengthen the heuristics of adwin-config (the TCP heuristics are still pretty
  weak)
- Make packet-adwin.c a "new style" dissector 
- Use find_or_create_conversation()
- Remove most of the check_col()'s

svn path=/trunk/; revision=34640
2010-10-25 01:43:54 +00:00
Jeff Morriss 8c7c46d0fc Remove trailing space in field name.
svn path=/trunk/; revision=34639
2010-10-25 00:57:41 +00:00
Bill Meier af4db6059a (Minor) Some whitespace cleanup.
svn path=/trunk/; revision=34634
2010-10-24 15:39:36 +00:00
Anders Broman b1e852cf70 Back out 34627 and friends again.
svn path=/trunk/; revision=34633
2010-10-24 15:22:44 +00:00
Bill Meier 2ccfd848fe From Jouni Malinen: Add support for new WSC 2.0 attributes and values
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5196

svn path=/trunk/; revision=34632
2010-10-24 15:18:43 +00:00
Gerald Combs fb932b68bf [Automatic manuf, services and enterprise-numbers update for 2010-10-24]
svn path=/trunk/; revision=34631
2010-10-24 15:03:37 +00:00
Anders Broman 525f7e0552 Clean up a few proto_add_bytes calls.
svn path=/trunk/; revision=34630
2010-10-24 14:15:04 +00:00
Anders Broman bfcc79bd23 error: ‘ieee802154_short_addr_invalidate’ declared ‘static’ but never defined
error: ‘ieee802154_long_addr_invalidate’ declared ‘static’ but never defined

svn path=/trunk/; revision=34629
2010-10-24 14:02:31 +00:00
Anders Broman 252ade740a Try to fix:
packet-zbee-nwk.c:260: error: static declaration of ‘zbee_table_link_keyring’ follows non-static declaration

svn path=/trunk/; revision=34628
2010-10-24 11:53:15 +00:00
Anders Broman 43cb273d08 From Fred Fierling:
Multi-key Support and Extended Address Mapping for ZigBee Dissectors
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331

svn path=/trunk/; revision=34627
2010-10-24 10:04:29 +00:00
Bill Meier 6d8ea4abd5 From Lori Tribble: Add vendor identifier dissector access to BACnet Private Transfer Msgs
BACnet has a private transfer service which is vendor specific.  The start of
 each request and response contains the vendor identifier.  I've added a way for
 vendors to provide their own dissectors by registering their vendor identifier.
 The packet-bacapp.c method fConfirmedPrivateTransfer has been modified to look
 for a vendor specified dissector.  If found it will be run.  If not found we
 default to running the standard dissection included in packet-bacapp.c.

 I modified the summary column display for private transfer messages so that the
 summary now displays the Vendor Identifier (V=xx) and the Service Number (SN=xx).

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

From me: Rename sub-dissector tablle to "bacapp.vendor_identifier"
         Change subdissector ui_name to "BACapp Vendor Identifier"

svn path=/trunk/; revision=34625
2010-10-22 18:13:42 +00:00
Jeff Morriss a25ece78e5 From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5329 :
Find a patch who clean up PPP dissector
* Remove check_col (from my previous patch #5325)
* Remove the #define ppp_min (unused) 
* Remove some unused ett_* 
* Cleanup NO ARRAY entry (it is a false positive of checkhf tool, it is need {
(in the same line) before a hf_... in hf_register_info struct
* Cleanup Unused entry in VSNP Dissector ( it's really strange, there is no
check when the code was added #4434 ;) )
* minor bug fix...

From me: put one of the check_col()'s (that also protects a val_to_str() call)
back in.

Note: the checkhf tool bug was fixed in rev 34623.

svn path=/trunk/; revision=34624
2010-10-22 18:05:50 +00:00
Jeff Morriss 052ba7eb46 From Tobias Klauservia https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5327 :
The current PRP dissector in packet-prp.c does not correctly identify VLAN
tags. It uses the hard coded value 0x8000 to check the ethertype.

The attached patch (against current SVN trunk) changes this to use the
ETHERTYPE_VLAN define from epan/etypes.h and also fixes two misspellings in the
respective comments.

svn path=/trunk/; revision=34622
2010-10-22 15:08:32 +00:00
Anders Broman 5bf4fc3116 From Vincent Helfre:
Some improvements for the presentations.

svn path=/trunk/; revision=34620
2010-10-22 13:35:03 +00:00
Stig Bjørlykke 14d908de38 Corrected check for end of well_known_sids.
This fixes bug 5328.

svn path=/trunk/; revision=34619
2010-10-22 10:48:14 +00:00
Stig Bjørlykke 61d99fff9a From Regis Cridlig via bug 5326:
The Lua text string passed to column:set(text) by a dissector will eventually
be reclaimed. This causes the column to display incorrect characters.

svn path=/trunk/; revision=34618
2010-10-22 06:47:00 +00:00
Stig Bjørlykke efd9c3e0c9 Fixed printing guint64 variables.
Removed unused variables.

svn path=/trunk/; revision=34617
2010-10-22 06:42:55 +00:00
Anders Broman e64d2d99c0 C++ style comments in packet-windows-common.c
svn path=/trunk/; revision=34616
2010-10-22 06:26:42 +00:00
Anders Broman 58be4653b4 packet-smb.c:890: warning: data definition has no type or storage class
svn path=/trunk/; revision=34615
2010-10-22 05:47:01 +00:00
Anders Broman 0761f82755 If the html dir exist remove it and its subdirectories.
svn path=/trunk/; revision=34614
2010-10-22 05:43:12 +00:00
Anders Broman 9c9db7d4d4 From CaL Turney:
Add support for well-known SIDs/RIDs and option to display in hex.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5286

svn path=/trunk/; revision=34613
2010-10-22 05:15:25 +00:00
Jeff Morriss 9e14fa17fb Replace blurb that matches the field name with NULL
svn path=/trunk/; revision=34612
2010-10-22 01:37:06 +00:00
Jeff Morriss 450be02fc2 From Shoichi Sakane via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5270 :
Update to use add the time as a filterable field and other cosmetic changes.

From me: exp2() seems to be C99 so #if the use of it out.

svn path=/trunk/; revision=34611
2010-10-21 22:41:39 +00:00
Bill Meier 8d8190c43f Cleanup:
- Reindent source; cleanup whitespace;
- Remove many unneeded 'if(tree)' & similar (Tnx to Jeff Morriss for the suggestion);
- remove unneeded initializers;
- Reformat some long lines;
- Fix up some comments showing message layout;
- Localize two static global variables.

svn path=/trunk/; revision=34610
2010-10-21 21:21:26 +00:00
Jaap Keuter 8f0cec63d7 From Sven Schnelle:
Add dissector for Tektronix Teklink Protocol, used by their Logic Analyzers.
May be useful for reverse engineering their Protocol.

svn path=/trunk/; revision=34609
2010-10-21 21:02:10 +00:00
Jeff Morriss bcfa8de44a Add some casts to get the Windows builds going.
svn path=/trunk/; revision=34608
2010-10-21 21:02:07 +00:00
Jeff Morriss 8187894200 After calling a subdissector, set a fence on COL_INFO so whatever the
subdissector put in the Info column stays there.

svn path=/trunk/; revision=34607
2010-10-21 20:51:06 +00:00
Bill Meier 6ebe1f252f From Srinivasa Pradeep: LDP dissector: Add/update PseudoWire TLV suport.
RFC 4447 describes new TLV called Generalised PWid FEC in LDP messages with the
 id 0x81. This is related to PsuedoWire setup and maintenance.
 Related to this, following are the TLVs which are defined in RFC 4447 and RFC 4446.
 1. PW Status TLV
 2. PW Interface parameters
 3. PW Group TLV

From me: remove some unused variables; Mark fcn arg as unused.


svn path=/trunk/; revision=34606
2010-10-21 19:13:57 +00:00
Jaap Keuter 81f60271c6 From Robert Wynn:
CableLabs has added additional TLV's to DHCP Option 60 Modem capabilities
reporting for their Docsis 2.0 devices.  Additionally, in Docsis 3.0, they have
moved the capabilities portion of Option 60 (sub-option 5) to now reside in the
vendor specific Option 125 using their Enterprise number (4491).

svn path=/trunk/; revision=34605
2010-10-21 19:01:35 +00:00
Jeff Morriss 01177b103e From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5325 :
It is a rework of PAP PPP dissector 
- Replace proto_tree_add_text by proto_tree_add_item 
- add col_append_fstr to show information (Peer-ID, Password...)

svn path=/trunk/; revision=34604
2010-10-21 16:08:29 +00:00
Jeff Morriss 9f3acc1e25 Aw, man, I knew this code was parsed, but I missed the docbook part. Revert 34598 and 34599.
svn path=/trunk/; revision=34602
2010-10-21 12:41:15 +00:00
Jeff Morriss 5c18160006 From Shoichi Sakane via bug 5270: minor changes and remove an unused hf variable.
svn path=/trunk/; revision=34600
2010-10-21 03:04:15 +00:00
Jeff Morriss 383df3dfe5 Make the indentation consistent.
Pull function names to column 0 - except when necessary for autoregistration.
Put function comments before the function.
For readability, put the macros for functions before the function too.
Put class functions before the class.

svn path=/trunk/; revision=34599
2010-10-21 02:50:27 +00:00
Jeff Morriss f3648fc66d Fix up indentation to get it consistent and other minor cleanup issues.
svn path=/trunk/; revision=34598
2010-10-21 00:54:58 +00:00
Jeff Morriss 30ab866b25 From Holger Freyther via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5320 :
Doing a Dumper:close() and then forcing the dumper to be garbage collected will
cause a segfault.

The code attempts to handle the GC that could follow but fails to do it
properly. Assigning Dumper dp = NULL will only have an affect within the scope
of this method... Assumingly this should be a *dp = NULL.

svn path=/trunk/; revision=34597
2010-10-21 00:37:40 +00:00
Anders Broman 773a7f4c59 From Fred Fierling:
Cleanup of unnecessary tree == NULL checks in ZCL dissector

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

svn path=/trunk/; revision=34595
2010-10-20 20:50:39 +00:00
Jeff Morriss f6a88f2be5 From Shoichi Sakane via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5270 :
I made a patch to support more COAP options.
some options includes variable length field.

svn path=/trunk/; revision=34592
2010-10-20 20:40:53 +00:00
Bill Meier 06325a1bd6 (Minor): pretfs callback not req'd;
Move call to data dissector undet 'if(tree)' so same value of
          offset used whether or not 'tree == NULL'.

svn path=/trunk/; revision=34591
2010-10-20 18:14:49 +00:00
Jeff Morriss 185d387f62 From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5270 :
Add dissector for PAPI (Aruba AP Control Protocol), used by Aruba WLAN
Controller).
There is no documentation on this protocol, the dissector is based on my
analysis ...

There is also an experimental "debug dissector" (not enable by default) for
dissecting the rest of data.

Changes by me:
- make it a new-style dissector
- change the name of the "debug" preference
- other minor changes

svn path=/trunk/; revision=34587
2010-10-20 16:49:21 +00:00
Anders Broman 64d4b08a82 From Vincent Helfre:
various bug fix and enhancement for Release 8 additionnal parameters.

svn path=/trunk/; revision=34585
2010-10-20 12:40:13 +00:00
Martin Mathieson d086e935e1 Add longer desriptions of SOStart and SOEnd fields.
svn path=/trunk/; revision=34584
2010-10-20 12:08:22 +00:00
Martin Mathieson 81a49eec81 In heuristic dissector, don't check/allocate struct until/unless signature pattern matches.
svn path=/trunk/; revision=34582
2010-10-20 09:58:40 +00:00
Jeff Morriss dfa6aa82a7 Fix SE memory corruption reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5318 :
Ensure the digest is smaller than our buffer before copying it.

svn path=/trunk/; revision=34581
2010-10-20 01:49:32 +00:00
Jeff Morriss df0692a8e6 Use while loops instead of goto's.
svn path=/trunk/; revision=34580
2010-10-20 01:37:03 +00:00
Jeff Morriss 8a7125f063 From Colin O'Flynn and Owen Kirby via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5266 :
The attached patch begins to add support for RPL to the ICMPv6 file. All
locations that RPL code have been added are marked with a comment allowing this
patch to be reverted at a future time if it is decided to e.g. move all the RPL
code to it's own dissector.

A few values await IANA assignment and are also clearly marked (in
packet-ipv6.h). 

Only the 'metric' option is left unsupported, as it is primarily defined in
another I-D.

svn path=/trunk/; revision=34579
2010-10-20 01:23:32 +00:00
Bill Meier 6c08c2c43a Use DISSECTOR_ASSERT (not g_assert) in dissectors...
svn path=/trunk/; revision=34577
2010-10-20 00:47:23 +00:00
Bill Meier 9787a5734a From Hadriel Kaplan: IPFIX file format support.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5242

svn path=/trunk/; revision=34576
2010-10-20 00:36:53 +00:00
Anders Broman a75d7209f5 From Fred Fierling:
Infinite loop in ZCL Discover Attributes dissection

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

svn path=/trunk/; revision=34575
2010-10-19 19:19:42 +00:00
Anders Broman c94d711d8e From Alexis La Goutte:
GRE Enhancements

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

svn path=/trunk/; revision=34573
2010-10-19 18:28:00 +00:00
Bill Meier a88357dbf4 Remove some #if 0'd code I left in by mistake a while back....
svn path=/trunk/; revision=34572
2010-10-19 17:43:52 +00:00
Anders Broman 88622252b1 From Tamás Regõs:
Make application ID readable from sub dissectors.

svn path=/trunk/; revision=34570
2010-10-19 15:21:05 +00:00
Bill Meier 7ae3e56828 Use dynamically created value_string_ext to store hash/symbol value_strings;
Also: minor code reformatting and re-arrangement.

svn path=/trunk/; revision=34569
2010-10-19 14:31:05 +00:00
Jeff Morriss a3bf744a0f From Shoichi Sakane via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5270 :
Remove some unused hf variables.

svn path=/trunk/; revision=34568
2010-10-19 13:30:40 +00:00
Stig Bjørlykke 1f2b9eca16 Init ett_coap_noop, another fix for bug 5305.
svn path=/trunk/; revision=34566
2010-10-19 06:58:08 +00:00
Jeff Morriss 8ad4c4efdd Don't use g_strcmp0(): it only exists in glib > 2.16.
Make read_length() static.

Start function names at column 0.

svn path=/trunk/; revision=34565
2010-10-18 21:55:56 +00:00
Bill Meier be1a3f5a7e Try to fix compile errors on 64 bit systems.
svn path=/trunk/; revision=34561
2010-10-18 18:37:07 +00:00
Bill Meier 8832221ca4 Remove some unneeded #includes ...
svn path=/trunk/; revision=34560
2010-10-18 17:46:12 +00:00
Martin Mathieson 7e938c7071 Don't clear info column when showing MAC or RLC-level info.
svn path=/trunk/; revision=34559
2010-10-18 17:02:19 +00:00
Bill Meier 13b8efbf25 From Holger Grandy: ETCH dissector
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5095

From me: Fix a bug in add_symbol which caused occasional Wireshark crashes;
         Add additional checking during parse of symbol hash file;
         Improve "directory not found" error message;
         Do misc code cleanup and simplification.

svn path=/trunk/; revision=34558
2010-10-18 16:15:12 +00:00
Jeff Morriss b0ab72ac70 Use port range for SCTP too.
svn path=/trunk/; revision=34557
2010-10-18 15:56:06 +00:00
Jeff Morriss 418b9b2958 Add SVN:Id tag. Copy copyright notice to the header file.
svn path=/trunk/; revision=34555
2010-10-18 13:26:35 +00:00
Jeff Morriss 13c4798e8c Add SVN:Id tag.
svn path=/trunk/; revision=34554
2010-10-18 13:24:10 +00:00
Stig Bjørlykke dcbd634884 Remove blurbs equal to name.
svn path=/trunk/; revision=34551
2010-10-18 07:41:47 +00:00
Stig Bjørlykke 7e42c00c9c Added some length checks for integers.
This fixes bug 5305.

svn path=/trunk/; revision=34550
2010-10-18 07:13:45 +00:00
Jörg Mayer 6ab1662ca7 Add expert info if the eth src mac has the I/G bit set
svn path=/trunk/; revision=34548
2010-10-17 20:28:20 +00:00
Stig Bjørlykke df48a37c2e Use correct abbrev for fragment entries.
svn path=/trunk/; revision=34547
2010-10-17 18:33:50 +00:00
Stig Bjørlykke 54671a1ebe Removed unused entries.
svn path=/trunk/; revision=34546
2010-10-17 18:16:44 +00:00
Stig Bjørlykke 305748ea57 Removed unused hf_xcsl.
svn path=/trunk/; revision=34542
2010-10-17 16:38:15 +00:00
Stig Bjørlykke 2b32589942 Removed unused hf_sasp.
svn path=/trunk/; revision=34541
2010-10-17 16:36:32 +00:00
Stig Bjørlykke 6fd85b83a4 Fixed typo in "Reason" abbrev.
svn path=/trunk/; revision=34540
2010-10-17 16:33:28 +00:00
Gerald Combs 2e00350103 [Automatic manuf, services and enterprise-numbers update for 2010-10-17]
svn path=/trunk/; revision=34538
2010-10-17 15:03:47 +00:00
Stig Bjørlykke 18ddeb1de5 Fixed typo in "SSI Noise (dBm)" abbrev.
svn path=/trunk/; revision=34537
2010-10-17 14:30:11 +00:00
Stig Bjørlykke 2b37214674 From Pascal Quantin via bug 5301:
Make the PER constaints check like in the BER dissector.

svn path=/trunk/; revision=34536
2010-10-17 14:07:05 +00:00
Anders Broman fdb2192631 From Pascal Quantin:
[NAS EPS] Enhance dissection of APN-AMBR IE

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

svn path=/trunk/; revision=34535
2010-10-17 14:04:59 +00:00
Stig Bjørlykke 8b5bb7d7ce From Benjamin Roch via bug 3418:
Use eth.src, eth.dst and eth.type from the ethernet dissector.

From me:
Removed unused code inside #if 0.

svn path=/trunk/; revision=34534
2010-10-17 14:02:06 +00:00
Stig Bjørlykke 396d8e3e18 From Benjamin Roch via bug 3418:
Added string values to tte.pcf.type.

svn path=/trunk/; revision=34533
2010-10-17 13:59:46 +00:00
Stig Bjørlykke ce60782e08 coap_handle is only used in proto_reg_handoff_coap.
svn path=/trunk/; revision=34532
2010-10-17 12:20:25 +00:00
Stig Bjørlykke 38ba5119cd From Pascal Quantin via bug 5301:
Add expert info when ASN.1 PER constrained integer does not match range.

svn path=/trunk/; revision=34531
2010-10-17 11:59:10 +00:00
Stig Bjørlykke 9d253d77ad From Shoichi Sakane via bug 5270:
Added COAP protocol support.

From me:
Made the port number configurable.

svn path=/trunk/; revision=34530
2010-10-17 11:48:40 +00:00
Martin Mathieson 1077ec28f6 Improve info column when showing PHY info for MAC frames.
svn path=/trunk/; revision=34529
2010-10-15 21:32:35 +00:00
Martin Mathieson 52e5567b2e Track and give link back to frame containing previous NACK.
svn path=/trunk/; revision=34528
2010-10-15 21:07:45 +00:00
Jörg Mayer 2556852f9e Make the telnet data lines filterable elements.
svn path=/trunk/; revision=34527
2010-10-15 21:02:30 +00:00
Martin Mathieson 9d87437659 Add volatile in several places to gcc warnings.
svn path=/trunk/; revision=34526
2010-10-15 18:41:12 +00:00
Jeff Morriss 37b28dda16 From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5295 :
Use macros for message type values and add an expert info for an incorrect
Magic Cookie.

svn path=/trunk/; revision=34525
2010-10-15 17:48:35 +00:00
Stig Bjørlykke 2b34ed288b Avoid getting BoundsError when trying to decode OCTET STRING or
unknown primitive as constructed ASN.1 BER encoded data.

svn path=/trunk/; revision=34520
2010-10-15 11:10:20 +00:00
Stig Bjørlykke 8b9c15d68f Added info column descriptions for AARQ and AARE.
svn path=/trunk/; revision=34519
2010-10-15 08:39:48 +00:00
Stig Bjørlykke e91a7ad6f7 Added packet-radiotap-iter.c
svn path=/trunk/; revision=34517
2010-10-14 18:13:39 +00:00
Gerald Combs dc46e7db50 Tighten up our data rate check. This should fix bug 5280 (mostly).
svn path=/trunk/; revision=34516
2010-10-14 18:09:57 +00:00
Gerald Combs ea4ca0524b From Johannes Berg via bug 4421:
radiotap: new parser

The current parser has a number of bugs, most
importantly not being able to parse radiotap
files with multiple presence bitmaps. It is
also rather hard extend. Use a generic library
for parsing radiotap that can be extended very
easily.


From me:

Dumb down some initializers and add some casts to make Visual C++ happy.

svn path=/trunk/; revision=34515
2010-10-14 17:56:06 +00:00
Bill Meier 15851701e8 Rework "extended value strings":
- Allow direct access when a range of values begins with a value other than 0;
- Provide value_string_ext_new() for creating extended value strings at runtime;
- Do access to value_string_ext members via a macro (all but value_string.c);
- Update documentation.

svn path=/trunk/; revision=34514
2010-10-14 17:50:35 +00:00
Stig Bjørlykke 6ead8f1ae5 Support multiple header fields with the same abbreviation in custom columns.
We have some different fields using the same abbreviation (e.g "eth.dst"
used in both eth and tte), and this patch will fetch values from all fields.
When using occurrences the entries listed first is from the field registered
last when starting Wireshark, and not ordered from the occurrence in the
packet, but I don't see how we can easily fix this.

svn path=/trunk/; revision=34513
2010-10-14 13:11:03 +00:00
Bill Meier ce887cb60d Fix crash for 'tshark -G values' when printing "extended value string" value.
Fixes bug #5296 [ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5296 ]

svn path=/trunk/; revision=34507
2010-10-14 04:53:07 +00:00
Jeff Morriss ebc190645f From Fulko Hew via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4615 :
The attached patch adds the missing decoded fields
by moving the proto_tree_add_item() call so that it
is no longer within an error handler and will be
called under normal circumstances (as well as error conditions.


From me: Apply the change to the ASN.1 source.  Also some white space
indentation cleanup.

svn path=/trunk/; revision=34505
2010-10-14 01:44:27 +00:00
Jeff Morriss aa749665c5 From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5295 :
Hi a patch to enchance the PPTP Dissector
It is a rework of PPTP dissector 
- Replace proto_tree_add_text by proto_tree_add_item 
- Replace not standard table and function by standard value_string
- ....

The code is checked and fuzzed (more 200 pass) ! with personnal PPTP Sample and
PPTP Sample from pcapr.net

svn path=/trunk/; revision=34504
2010-10-14 01:10:51 +00:00
Gerald Combs fc260f7967 From Johannes Berg via bug 4421:
radiotap: re-indent

The current file has very strange mix of various
indentation sometimes using spaces and sometimes
using tabs which is rather hard to keep intact,
so reindent it completely.

svn path=/trunk/; revision=34503
2010-10-13 21:30:27 +00:00
Bill Meier 05168e614f Access several large value-string arrays via extended value-string functions.
svn path=/trunk/; revision=34501
2010-10-13 18:51:23 +00:00
Bill Meier 5ed532268f Use extended value string functions to access dce_error_vals (which has 4397 entries)
svn path=/trunk/; revision=34500
2010-10-13 17:56:05 +00:00
Bill Meier 45da078b7d Use val_to_str_ext_const for refs to the extended value strings;
Extern the extended value strings struct (not the value_string arrays themselves) so
 any external use of these arrays is via the extended value string functions.

svn path=/trunk/; revision=34499
2010-10-13 16:47:13 +00:00
Guy Harris f2f1023487 Fix comments (not all platforms on which we run support dlopen(), but
GLib handles that with g_module_open() as a platform-independent "load a
module at run time" wrapper).

svn path=/trunk/; revision=34491
2010-10-12 18:25:42 +00:00
Bill Meier c78221d4ce Rename g_resolv_flags --> gbl_resolv_flags; Also: cleanup some whitespace & indentation.
svn path=/trunk/; revision=34487
2010-10-12 13:15:08 +00:00
Jeff Morriss 0267a5293d Fix an error in a comment I added last week.
svn path=/trunk/; revision=34480
2010-10-11 20:16:35 +00:00
Bill Meier e7568712ef Define some fcns & vars as static;
Minor whitespace and comments cleanup.

svn path=/trunk/; revision=34477
2010-10-11 19:00:55 +00:00
Jeff Morriss 074e49fd41 hf variables can be copied/passed by value, not by reference.
svn path=/trunk/; revision=34467
2010-10-11 01:52:41 +00:00
Jeff Morriss 6deff94555 Add comments indicating that the DISSECTOR_ASSERT() routines should not be used to report malformed packets.
svn path=/trunk/; revision=34466
2010-10-11 01:28:22 +00:00
Bill Meier 0b9a803e45 #include <string.h> apparently req'd on OSX ...
svn path=/trunk/; revision=34465
2010-10-10 23:48:16 +00:00
Bill Meier 93b94a23ca Define some fcns & vars as static; Some #includes not req'd; packet-mikey.h not req'd.
svn path=/trunk/; revision=34464
2010-10-10 23:28:40 +00:00
Bill Meier 09d718f723 Rename vals_status & vals_pdu_type to wsp_vals_status & wsp_vals_pdu_type
svn path=/trunk/; revision=34463
2010-10-10 20:45:19 +00:00
Bill Meier 4ae8d25300 Minor code cleanup:
- define some vars & fcns as static;
- remove an unused var;
- use tfs_set_notset in tfs.c;
- slightly simplify reg_handoff.

svn path=/trunk/; revision=34462
2010-10-10 20:39:00 +00:00
Bill Meier 4d56c5b57b Define a variable as static; Minor code simplification.
svn path=/trunk/; revision=34461
2010-10-10 20:28:22 +00:00
Bill Meier 6486e8b781 Combine packet-opsi.h with packet-opsi.c (since not used elsewhere); Define some fcns as static.
svn path=/trunk/; revision=34460
2010-10-10 20:19:05 +00:00
Bill Meier acccf6a77c Define some fcns & vars as static...
svn path=/trunk/; revision=34459
2010-10-10 20:14:34 +00:00
Bill Meier 209109c2fd Define some fcns & vars as static ...
svn path=/trunk/; revision=34458
2010-10-10 20:07:06 +00:00
Bill Meier 219877f1d3 #include <epan/tfs.h> not req'd.
svn path=/trunk/; revision=34457
2010-10-10 20:03:39 +00:00
Gerald Combs cca5e071af [Automatic manuf, services and enterprise-numbers update for 2010-10-10]
svn path=/trunk/; revision=34448
2010-10-10 15:03:38 +00:00
Stig Bjørlykke ccfe41300c Added "Edit Column Details" functions to the packet list heading popup.
Removed "Rename Column Title" as this is moved to "Edit Column Details".

svn path=/trunk/; revision=34444
2010-10-09 15:22:53 +00:00
Jeff Morriss 161a233392 Restore pinfo->private_data after an exception was thrown by a subdissector.
This is necessary in case a subdissector had changed it but was unable to
restore it (due to the exception).

svn path=/trunk/; revision=34437
2010-10-08 18:11:31 +00:00
Jeff Morriss 33f116a46d Restore pinfo->private_data after an exception was thrown by a subdissector.
This is necessary in case a subdissector had changed it but was unable to
restore it (due to the exception).

Remove check_col().

svn path=/trunk/; revision=34436
2010-10-08 17:48:22 +00:00
Jeff Morriss 7321549932 Don't use a TRY/CATCH block just to ignore any exceptions thrown by
tvb_get_ntohs(): check the remaining tvb length instead.

svn path=/trunk/; revision=34435
2010-10-08 17:37:19 +00:00
Martin Mathieson f6ee7d8d4f From Tobias Witek (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5283)
epan/dissectors/packet-umts_fp.c
* Added mac subdissector (MAC) call to HSDSCH TYPE2 frames

epan/dissectors/packet-umts_mac.c
* Added support for HSDSCH TYPE2 frames by means of
        not nibble-shifting (4 bits) the SDU if MAC-ehs is used

epan/dissectors/packet-rlc.c
* Added support for "Use special value of the HE field" (3gpp 25.332-7a0 
9.2.2.7) commonly used for Release 7 HSDPA.
        REMARK: although the specification mandates that the
        special value is only allowed when activated by higher
        layers (RRC), it is interpreted unconditionally. We assume
        this is OK, because a different use in future specifications
        is very unlikely.

epan/dissectors/packet-fp_hint.c
* Added decoding of MAC-ehs indicator for HSDSCH frames
* Bumped fpi->release from 6 to 7 to enable proper
        HSDSCH TYPE2 frame decoding in the UTMS MAC parser.
        In general, this appears not to affect decoding
        of (conformant) FP frames of pevious releases.

svn path=/trunk/; revision=34433
2010-10-08 11:03:08 +00:00
Jeff Morriss fae45ea6a1 Remove check_col()
svn path=/trunk/; revision=34426
2010-10-08 01:50:50 +00:00
Jeff Morriss 8d9ed7f963 Restore private_data even if there was an exception
svn path=/trunk/; revision=34424
2010-10-08 01:36:20 +00:00
Jeff Morriss f8402031c5 Don't use a TRY/CATCH block just to ignore any exceptions thrown by
tvb_get_ntohs(): check the remaining tvb length instead.

svn path=/trunk/; revision=34421
2010-10-08 01:17:04 +00:00
Jeff Morriss a179cfb90a Catch exceptions from subdissectors, even when we're not handing the
subdissector the first fragment of a fragmented message so that an exception
in the first chunk doesn't abort dissection of subsquent chunks in the frame.

Restore pinfo->private_data after an exception was thrown by a subdissector.
This is necessary in case a subdissector had changed it but was unable to
restore it (due to the exception).

svn path=/trunk/; revision=34420
2010-10-08 01:05:33 +00:00
Bill Meier 695aff26f9 (Minor) Rename a few variables in the global namespace to be a bit more unique;
Also: rename additional (static) variables to be consistent with the above renames.

svn path=/trunk/; revision=34412
2010-10-07 21:23:36 +00:00
Bill Meier 54ed1b0bc7 Define a few global variables as static.
svn path=/trunk/; revision=34411
2010-10-07 21:16:52 +00:00