Commit Graph

13369 Commits

Author SHA1 Message Date
Jörg Mayer eb686a2146 Synchronize dissector lists between CMakeLists.txt and
dissectors/Makefile.common:

The following dissectors were missing from CM:
  dissectors/packet-dcerpc-budb.c
  dissectors/packet-dcerpc-butc.c
  dissectors/packet-dcerpc-drsuapi.c
  dissectors/packet-gsmtap.c

Both: Whitespace fixes and reordering.

svn path=/trunk/; revision=33462
2010-07-07 13:25:36 +00:00
Jaap Keuter 0494e951b8 Fix for bug 4982:
Handle concatenated Status and other message.

svn path=/trunk/; revision=33457
2010-07-06 17:22:12 +00:00
Jeff Morriss 4522f9b0a4 Limit the number of operations to 128 (arbitrary number) to keep us from attempting to mallocate way too much memory. This fixes the fuzz failure reported in bug 4976.
svn path=/trunk/; revision=33456
2010-07-06 14:57:54 +00:00
Anders Broman c5ddd5a253 Add miising else handling a zero msg_auth_code.
svn path=/trunk/; revision=33455
2010-07-06 13:21:34 +00:00
Guy Harris 80c8a18da7 Use G_GINT64_CONSTANT() to make a 64-bit all-bits-set constant.
svn path=/trunk/; revision=33454
2010-07-06 09:51:28 +00:00
Guy Harris 39f85d188c No need to add a fake field with the opcode as a string - you can just
compare the real opcode field against a string.

svn path=/trunk/; revision=33452
2010-07-06 08:43:07 +00:00
Stig Bjørlykke 8f686e8af0 Try checking for G_MAXUINT64 instead of 0xffffffffffffffff.
svn path=/trunk/; revision=33451
2010-07-06 07:45:38 +00:00
Stig Bjørlykke c7f2634f52 Removed non-ASCII characters.
svn path=/trunk/; revision=33450
2010-07-06 06:54:51 +00:00
Stig Bjørlykke 22056542a8 Fix the build on OSX.
svn path=/trunk/; revision=33449
2010-07-06 06:40:34 +00:00
Anders Broman 4a16e04cc0 Fix:
packet-nfs.c:699: warning: type defaults to 'int' in declaration of 'nfsv4_operation_tiers'

packet-nfs.c:9583: warning: unused variable 'saved_fh_hash'
packet-nfs.c:9580: warning: unused variable 'name'

svn path=/trunk/; revision=33448
2010-07-06 05:53:18 +00:00
Anders Broman 7bded303a4 Fix "checked api failed"
svn path=/trunk/; revision=33447
2010-07-06 05:46:52 +00:00
Anders Broman 0b0db7e0d7 From Brett Kuskie:
Enhancement of the dcerpc-svcctl dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4858

svn path=/trunk/; revision=33446
2010-07-06 04:43:45 +00:00
Anders Broman 36f5046490 From Frank Schorr:
The packet-nbns.c dissector picks random data as the NBSS PDU length in certain situations.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4914

svn path=/trunk/; revision=33445
2010-07-06 04:32:21 +00:00
Anders Broman 85a9a2cd21 From Sven Eckelmann:
Dissector/packet-batadv: Add support for icmp rr.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4922

svn path=/trunk/; revision=33444
2010-07-06 04:27:01 +00:00
Anders Broman 8d917e7bca From Andrew Feren:
Several small fixes to NetFlow decoding.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4962

svn path=/trunk/; revision=33443
2010-07-06 04:20:27 +00:00
Anders Broman a13bf525a8 From Ian Schorr:
NFSv4 usability enhancements (Info column summaries, filterable fields).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4975

svn path=/trunk/; revision=33442
2010-07-06 04:13:54 +00:00
Jörg Mayer 3bef8584a4 So many people who love to use easy to remember ports.
Improve heuristics to exclude cases where the traffic
definitely isn't Cisco's IPSEC inside TCP.

Does this obsolete the NDMP protocol check?

svn path=/trunk/; revision=33441
2010-07-05 23:21:58 +00:00
Anders Broman 7e2f42090d From Jouni Malinen:
Add dissecting for IEEE 802.11u GAS frames.

svn path=/trunk/; revision=33439
2010-07-05 20:04:46 +00:00
Martin Mathieson 8bf9b7a3b3 Change type back to 16-bit to fix buildbot.
Will change subframe numbers to 8-bit later.

svn path=/trunk/; revision=33438
2010-07-05 17:28:28 +00:00
Martin Mathieson b2a872cd9f Show grant-subframe from context info.
svn path=/trunk/; revision=33437
2010-07-05 16:45:36 +00:00
Anders Broman 419dd3e945 From Jouni Malinen:
Add dissecting for SA Query Action frames (IEEE 802.11w)

svn path=/trunk/; revision=33436
2010-07-05 16:05:21 +00:00
Anders Broman 1962892ac0 From Jouni Malinen:
Add a proto tree item for Current Channel in DS Parameter Set element.

svn path=/trunk/; revision=33435
2010-07-05 15:59:11 +00:00
Martin Mathieson b7f136ae41 Check range of supplied subframe number. If out, set back to max (9) and
add expert info error.  Should fix bug 4970.

svn path=/trunk/; revision=33432
2010-07-05 10:50:27 +00:00
Martin Mathieson 735ec2d6d2 For DL HARQ retx, support knowing result or not.
svn path=/trunk/; revision=33431
2010-07-05 10:35:17 +00:00
Stig Bjørlykke 7b64be6a80 Revert COL_DSCP_VALUE back to value set in packet-ip.c.
Right justify COL_DSCP_VALUE (and COL_DCE_CALL as in the old packet list).

svn path=/trunk/; revision=33430
2010-07-05 09:05:27 +00:00
Gerald Combs 2f1e6127aa [Automatic manuf and enterprise-numbers update for 2010-07-04]
svn path=/trunk/; revision=33426
2010-07-04 15:03:32 +00:00
Stig Bjørlykke ab215a67d5 Code cleanup:
- Use ep_strdup_printf instead of ep_alloc + g_snprintf
- Untabify

svn path=/trunk/; revision=33414
2010-07-02 13:15:44 +00:00
Guy Harris 63a0810874 oid_encoded2string() returns a const char *; don't assign it to a char
*.

Don't declare variables in the middle of a block; not all the compilers
we use support that.

svn path=/trunk/; revision=33409
2010-07-02 03:50:30 +00:00
Bill Meier 89015cb584 From Sven Eckelmann: Fix size of seqno in icmp packets
See Bug #4921: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4921

svn path=/trunk/; revision=33405
2010-07-01 19:19:03 +00:00
Bill Meier b88b612f02 From Sven Eckelmann: Add support for v11 packet format
"Please add support for v11 ogm packets used in linux 2.6.36"
See: Bug #4920: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4920

svn path=/trunk/; revision=33404
2010-07-01 18:42:41 +00:00
Gerald Combs ad7b7cc679 Don't add raw bytes to the tree.
svn path=/trunk/; revision=33403
2010-07-01 17:57:53 +00:00
Gerald Combs a7df969fb1 Have get_ber_length() set the length to 0 by default. This restores behavior
that was lost recently.

svn path=/trunk/; revision=33402
2010-07-01 16:35:37 +00:00
Bill Meier f1c540a54c Rework ethernet address resolution: step 3 of 3:
- Primarily: ethernet name lookup returns either
   unresolved or resolved ethernet name depending upon whether 
   MAC Name resolution is disabled or enabled.
   Previously: Unresolved or resolved name cached at first reference
   and then always returned for future references no matter whether
   MAC Name Resolution was enabled or disabled. 
- Also: Refactor ethernet, manuf & well-known-addr related code;

ToDo: (separately): Redisplay when 'MAC name resolution' enabled/disabled. 

svn path=/trunk/; revision=33401
2010-07-01 15:11:02 +00:00
Gerald Combs 622f07b95e Initialize MechType_oid in the right place.
svn path=/trunk/; revision=33396
2010-07-01 00:44:21 +00:00
Gerald Combs 6aaa5874c6 Initialize more variables.
svn path=/trunk/; revision=33392
2010-07-01 00:11:14 +00:00
Gerald Combs caff9b5513 Initialize a variable.
svn path=/trunk/; revision=33390
2010-06-30 23:45:24 +00:00
Gerald Combs a629fe9c3f Initialize some variables.
svn path=/trunk/; revision=33389
2010-06-30 23:40:05 +00:00
Gerald Combs 47c6bf912f Initialize a variable.
svn path=/trunk/; revision=33388
2010-06-30 23:36:24 +00:00
Gerald Combs bc9f8d0cd7 Add Visual C++ project files to the distribution.
svn path=/trunk/; revision=33386
2010-06-30 23:20:03 +00:00
Gerald Combs 27fcf779ae Use the right array bounds.
svn path=/trunk/; revision=33385
2010-06-30 23:07:58 +00:00
Graeme Lunt 852d60ca7e When determining a BER length, make sure the BER identifier was marked as constructed if an indefinite length is encountered.
This helps prevent a stack overflow problem reported in Bug 4951.


svn path=/trunk/; revision=33383
2010-06-30 10:06:21 +00:00
Stig Bjørlykke e777398d4f Added expert info for illegal bitstring padding and when bits are set
in the padded area.

svn path=/trunk/; revision=33382
2010-06-30 09:09:18 +00:00
Gerald Combs 83c5be18c7 Add End Marker back in.
svn path=/trunk/; revision=33380
2010-06-29 23:50:51 +00:00
Gerald Combs bce5424063 Completely revert r33367 so that we don't duplicate content in
packet-gtp.h.

svn path=/trunk/; revision=33379
2010-06-29 23:48:24 +00:00
Guy Harris 2d4033611c Include packet-gtp.h in the release tarball.
svn path=/trunk/; revision=33378
2010-06-29 23:37:10 +00:00
Graeme Lunt 6fc0e7cb8c Interpret single-ASN1-type as ASN.1 and not as an OCTET STRING.
svn path=/trunk/; revision=33375
2010-06-29 18:09:03 +00:00
Graeme Lunt 4095079e1c Decode parameters as ASN.1 directly and avoid interpreting as an OCTET STRING.
svn path=/trunk/; revision=33374
2010-06-29 18:07:33 +00:00
Gerald Combs 8906791528 Shorten "Number of bytes in flight" to "Bytes in flight", otherwise we
end up with a really wide column.

svn path=/trunk/; revision=33373
2010-06-29 15:58:00 +00:00
Anders Broman 2903a17305 Dissect one F-container
svn path=/trunk/; revision=33372
2010-06-29 14:56:39 +00:00
Anders Broman 929e1c1d98 Allow dissection if not ciphered.
svn path=/trunk/; revision=33371
2010-06-29 14:50:40 +00:00
Graeme Lunt 5aa05c8559 New "#.SYNTAX" section for the asn2wrs conformance file.
This allows syntaxes to be registered separately from PDUs.
Within the new section, the ASN.1 types to be used as syntaxes should be iterated. 
An optional second parameter on each line may be provided to provide an alternative name for the syntax (that the user will see). This name must be in double quotes.



svn path=/trunk/; revision=33370
2010-06-29 12:16:10 +00:00
Anders Broman 6644f9da35 Update to V9.3.0 (2010-06)
Export ENB-StatusTransfer-TransparentContainer

svn path=/trunk/; revision=33369
2010-06-29 10:46:54 +00:00
Anders Broman 3123ecf3e4 Add "End Marker" get rid of the .h file as no one imports anything.
(Leave the .h file for a while).

svn path=/trunk/; revision=33367
2010-06-29 08:06:13 +00:00
Anders Broman 2707d0ddde Set pinfo->link_dir when protocol configuration options is in the message.
svn path=/trunk/; revision=33366
2010-06-29 05:40:45 +00:00
Bill Meier 9427f9f2c3 Hack to prevent checkAPIs.pl from complaining about missing const in
'static value_string syntax_names[...]' 

svn path=/trunk/; revision=33365
2010-06-29 03:43:17 +00:00
Bill Meier 14a209b03a Rework ethernet address resolution: step 2:
- Use a new hashwka_t struct (instead of hashether_t) for 
   "well-known-address" hash entries (saves some space);
- Remove unused variable from hashether_t;
- Reorder variables within hashether_t and hashmanuf_t to minimize padding in the structures;
- Rename some variables for clarity;
- Misc whitespace changes.

svn path=/trunk/; revision=33364
2010-06-29 02:53:17 +00:00
Gerald Combs a9650cd851 Don't try to use a NULL tvb in call_ber_oid_callback(). Fixes bug 4950.
svn path=/trunk/; revision=33363
2010-06-29 00:44:41 +00:00
Gerald Combs 9afeb63b49 Make sure we don't dereference an invalid function pointer. Fixes bug 4949.
svn path=/trunk/; revision=33362
2010-06-29 00:08:24 +00:00
Gerald Combs a514fe61c3 tvb_get_ptr() may not return a valid string. Must I break out the
picture of the cow again?

svn path=/trunk/; revision=33361
2010-06-28 23:11:48 +00:00
Bill Meier 0a785ddea8 (Trivial): Whitespace revisions.
svn path=/trunk/; revision=33360
2010-06-28 22:43:13 +00:00
Bill Meier 3af757c875 Rework ethernet address resolution: step 1: simplify 'get_ether_name_if_known()'
svn path=/trunk/; revision=33359
2010-06-28 22:29:49 +00:00
Gerald Combs dd4e194304 Make sure dissect_ber_integer() always sets a value.
svn path=/trunk/; revision=33358
2010-06-28 22:13:53 +00:00
Stig Bjørlykke 51ef439176 Mark an unused argument.
svn path=/trunk/; revision=33357
2010-06-28 21:05:31 +00:00
Stig Bjørlykke 6aba36dcc2 Add the missing packet-s1ap.h
svn path=/trunk/; revision=33356
2010-06-28 21:04:56 +00:00
Stig Bjørlykke 1c81c60477 Search in user defined oid syntax table before built-in oid table in
call_ber_oid_callback(), so the user can override the defaults in the
"OID Tables".

svn path=/trunk/; revision=33355
2010-06-28 19:06:16 +00:00
Gerald Combs e2c79ddfd0 It looks like dissect_ber_octet_string() is called with the expectation
that out_tvb will always be set (the H.248 dissector does this, at
least). Make sure we do so. Do the same for
dissect_ber_constrained_octet_string().

svn path=/trunk/; revision=33354
2010-06-28 17:26:07 +00:00
Martin Mathieson a8aeaf6986 Change a couple of format specifiers: %-nu looks better than %0nu here
svn path=/trunk/; revision=33353
2010-06-28 17:25:58 +00:00
Anders Broman 7ba4ce1983 Dissect more GTPV2 IE's
svn path=/trunk/; revision=33351
2010-06-28 15:31:41 +00:00
Graeme Lunt 1d8014fab4 Removal of various warnings, mainly by not emitting functions for ASN.1 types that are only used for COMPONENTS OF.
svn path=/trunk/; revision=33350
2010-06-28 14:24:32 +00:00
Stig Bjørlykke 9c20c7b510 From Hitoshi Irino via bug 4942:
1. fix the bug in dissect_v9_pdu.
(The bug is introduced in r32627, It's my fault, I'm sorry.)
When option data record is decoded, unpatched dissect_v9_pdu decode only scope
fields, it does not decode following data fields. And it runs in endless loop
when length of a scope filed is 0. This patch solve these problem.
2. defines some value_strings for some fields.
3. updates URLs in comment.

svn path=/trunk/; revision=33348
2010-06-28 12:42:40 +00:00
Martin Mathieson f95aed808a Further improvements to UM sequence analysis.
svn path=/trunk/; revision=33346
2010-06-28 10:50:03 +00:00
Stig Bjørlykke 8246e87432 Moved register_ber_syntax_dissector() and register_ber_oid_syntax() from
proto_reg_handoff_* to proto_register_*.

svn path=/trunk/; revision=33345
2010-06-28 10:34:15 +00:00
Graeme Lunt 342fc4cfb4 After a nudge from Stig (thanks Stig), convert the OID configuration from
GKeyFile (which is not available on Sparc Solaris) to a User Accessible 
Table(UAT). 
This also allows the user to manage the configuration from the Wireshark GUI 
and select the associated syntax from a drop down list.


svn path=/trunk/; revision=33344
2010-06-28 09:33:04 +00:00
Graeme Lunt 812274918a Introduce an Object Identifier field macro, together with an appropriate field
check routine.
Also, a field type which is an enumerated string value.


svn path=/trunk/; revision=33343
2010-06-28 09:30:15 +00:00
Graeme Lunt 0d9ad5016e Remove the -R flag (used to generate syntax registrations) and replace with a
packet-<proto>-syn-reg.c output file. This is more generic and allows the 
syntax registrations to the directed from the template file.


svn path=/trunk/; revision=33342
2010-06-28 09:26:41 +00:00
Gerald Combs 6d60493b8a Initialize attributedesc_string in a couple of places so that we
don't end up trying to use an invalid pointer.

svn path=/trunk/; revision=33341
2010-06-27 22:38:28 +00:00
Gerald Combs 01568c1709 Make sure some variables are initialized.
svn path=/trunk/; revision=33340
2010-06-27 21:47:06 +00:00
Gerald Combs 2e05cc68c0 [Automatic manuf and enterprise-numbers update for 2010-06-27]
svn path=/trunk/; revision=33336
2010-06-27 15:03:39 +00:00
Anders Broman dfc1f80e70 From KATAOKA Toshihiro:
MIPv6 Heartbeat

svn path=/trunk/; revision=33335
2010-06-27 08:22:50 +00:00
Anders Broman f4c87595c9 From KATAOKA Toshihiro:
3GPP S1AP Transparent Container.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4913

svn path=/trunk/; revision=33330
2010-06-26 16:39:18 +00:00
Stig Bjørlykke 3f9a94d773 Avoid crash when adding SNMP Users.
This fixes bug 4926.

svn path=/trunk/; revision=33329
2010-06-26 12:00:08 +00:00
Martin Mathieson b040f1ac8c Improve UM analysis - make it more like AM.
svn path=/trunk/; revision=33328
2010-06-25 23:04:16 +00:00
Gerald Combs 5f932275b0 Make sure our addresses are modulo 2^16 in a lot of places. Fixes a
crash found while fuzzing, and hopefully fixes bug 4867.

In sigcomp_init_udvm() initialize the first 8 bytes of our buffers,
which squelches a valgrind complaint.

svn path=/trunk/; revision=33321
2010-06-25 17:14:41 +00:00
Stig Bjørlykke 5a69e41f6e Enable "Show Resolved" for custom OID columns.
svn path=/trunk/; revision=33320
2010-06-25 10:44:12 +00:00
Stig Bjørlykke b1a75e6aae Run uat->post_update_cb() in uat_load().
svn path=/trunk/; revision=33319
2010-06-25 09:58:25 +00:00
Stig Bjørlykke d74c9aa2d0 Added get_column_resolved and set_column_resolved.
svn path=/trunk/; revision=33318
2010-06-25 07:35:52 +00:00
Stig Bjørlykke beb4314276 Introduce "Show Resolved" as an option in custom columns. This will determine
if we show the value or the string representing the value.

This setting is not stored in the preferences file yet, and the option is
not available in the columns preferences window.

svn path=/trunk/; revision=33317
2010-06-25 06:42:34 +00:00
Stig Bjørlykke 4a34cf5892 Ensure we use the numeric value when creating a filter from a custom column
entry displaying a integer value.  The resolved string can contain a space,
and our routines does not quote integer values, and A DEC_HEX/HEX_DEC
combination will never match.

svn path=/trunk/; revision=33315
2010-06-24 18:07:40 +00:00
Stig Bjørlykke 8aaa5b8ec7 Added description of ECT and ECN-CE, added TFS for the bit values
and some item cleanup.

svn path=/trunk/; revision=33313
2010-06-24 11:37:03 +00:00
Anders Broman f9d6b18de7 from Sylvain Munaut:
SDCCH8 subchannel decoding error in GSM RR dissector 
Summary:  SDCCH8 subchannel decoding error in GSM RR dissector  

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

svn path=/trunk/; revision=33312
2010-06-24 10:42:13 +00:00
Anders Broman 1b390de1dc Try to fix the build.
svn path=/trunk/; revision=33310
2010-06-24 06:37:31 +00:00
Anders Broman 8396802773 From "wiresharkbugzilla@jdkbx.cjb.net":
Support for RFC4279 Pre-Shared Key Ciphersuites for Transport Layer Security (TLS)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4853

svn path=/trunk/; revision=33309
2010-06-24 06:01:11 +00:00
Bill Meier 5a7cd67ec7 Use ENC_NA rather than FALSE.
svn path=/trunk/; revision=33308
2010-06-23 20:17:33 +00:00
Bill Meier d7b4bbc98a From Haakon Nessjoen: New dissector for Digiums TDMoE protocol
From me: A few minor changes:
- col-clear() not req'd;
- Use 'gint32 length' rather than 'guint8 length';
- Use ENC_NA instead of FALSE/TRUE in two cases;
- Move global tdmoe_handle to be local to proto_reg_handoff...

svn path=/trunk/; revision=33307
2010-06-23 20:08:11 +00:00
Stig Bjørlykke 800a4fff2d Use correct data type for port number.
svn path=/trunk/; revision=33306
2010-06-23 19:59:35 +00:00
Graeme Lunt 14d5a86ee5 The version of glib on Solaris 10 (2.4?) does not support GKeyFile which was
introduced in 2.6. Disable oid table if GKeyFile is not available. 


svn path=/trunk/; revision=33303
2010-06-23 14:26:19 +00:00
Bill Meier d0d5de6d1e - Use tvb_reported_length() instead of tvb_length() in a few cases;
- col_clear() not req'd;
- Use guint32 for offset;
- Minor whitespace/indentation cleanup.

svn path=/trunk/; revision=33302
2010-06-23 14:24:09 +00:00
Stig Bjørlykke 3ba2260b8b Ensure the "Delta time displayed" is always zero for the first displayed
packet, and not the delta from the first captured package.

svn path=/trunk/; revision=33301
2010-06-23 11:57:16 +00:00
Graeme Lunt 1fce0a0ac2 Configuration to allow the definition of an OID name and associated syntax.
It allows the user to:
* Add names and/or syntaxes for OIDs that Wireshark doesn't natively understand
* Override the built-in OID names (e.g. change 'id-at-organization' to 'o')
* Use a special syntax, "ASN.1", that allows a value associated with an OID 
  to be dissected as "unknown ber". (This is a effectively a selective 
  version of the "Decode unexpected tags as BER encoded data" BER option.)

The configuration file is a glib key-value file, with the dotted OID used as
the group, and two keys defined, "name" and "syntax".

A configuration option is added to the BER preferences page. A single 
configuration file may be specified, or a directory may be specified. If a 
directory is specified, then the files with a ".oid" extension will be loaded.

An example configuration file:

[2.5.21.5]
name=attributeTypes
syntax=ASN.1
[2.5.21.6]
name=objectClasses
[2.5.21.7]
name=nameForms
[1.2.840.10040.4.3]
name=id-dsa-with-sha1
[2.5.4.6]
name=c
[2.5.4.10]
name=o
[2.5.4.11]
name=ou
[2.5.4.3]
name=cn
[1.3.32.0.2.0.4.66]
name=Unknown OID
syntax=PrintableString
[0.9.2342.19200300.100.1.10]
name=unknown dn
syntax=DistinguishedName

----

The list of known syntaxes is shown in the "Decode As ..." dialog when 
examining a BER file.


svn path=/trunk/; revision=33300
2010-06-23 11:28:59 +00:00
Graeme Lunt 1392185eba Update to register basic ASN.1 syntaxes.
svn path=/trunk/; revision=33299
2010-06-23 11:07:08 +00:00
Stig Bjørlykke 2b829eaebb Added link to a protocol description.
Show the control packet magic number.
Set correct length on the control packet item.
Corrected some blurbs.

svn path=/trunk/; revision=33295
2010-06-23 07:26:50 +00:00
Anders Broman 6f754a1f1b FromToshihiro Kataoka:
Dissect 3GPP S1AP UE Capability Info Indication.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4904

svn path=/trunk/; revision=33294
2010-06-23 04:50:52 +00:00
Bill Meier c3f91fd021 Strengthen test for Gigamon trailer;
Change some indentation/spacing.

svn path=/trunk/; revision=33293
2010-06-23 00:04:37 +00:00
Stig Bjørlykke 86abd88b20 From Håkon Nessjøen:
Added configurability of port number.

From me:
Removed some unneeded variable inits.

svn path=/trunk/; revision=33292
2010-06-22 16:56:07 +00:00
Bill Meier 875223e53e Ensure no exceptions thrown while checking for Gigamon trailer.
(Builds upon the previous commit by Anders).

svn path=/trunk/; revision=33291
2010-06-22 15:33:27 +00:00
Stig Bjørlykke babe65cbab From Håkon Nessjøen via bug 4899:
Dissector for Mikrotik RouterOS protocol for telneting without using IP
addresses.

From me:
Code cleanup.

svn path=/trunk/; revision=33289
2010-06-22 15:12:20 +00:00
Stig Bjørlykke 2e5c2b805f Check for custom column before using custom_field.
Store hidden columns correctly.

svn path=/trunk/; revision=33288
2010-06-22 13:40:28 +00:00
Anders Broman 017e4d0dc0 If the trailer is less than 4 bytes it's not a Gigamon hdr.
svn path=/trunk/; revision=33287
2010-06-22 13:29:33 +00:00
Stig Bjørlykke c7ed9aa2b8 Update to reflect changes in defines: REP_* > ENC_*
svn path=/trunk/; revision=33286
2010-06-22 11:54:45 +00:00
Stig Bjørlykke 737c0e843b Always make new columns visible.
svn path=/trunk/; revision=33285
2010-06-22 11:09:07 +00:00
Jaap Keuter 19bd423fe9 Fix for bug 4852:
Don't short circuit dissection if tree==NULL when column values are to be set.

svn path=/trunk/; revision=33282
2010-06-22 07:52:06 +00:00
Bill Meier e79dddc257 Add an if-test to fix a fuzz-test crash;
See Bug #4897: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4897

svn path=/trunk/; revision=33280
2010-06-21 14:24:34 +00:00
Stig Bjørlykke 61cc66770a Removed leading empty line.
svn path=/trunk/; revision=33278
2010-06-21 11:30:27 +00:00
Stig Bjørlykke 4bb2c88694 Corrected printed name for id-permissiveAttributes.
svn path=/trunk/; revision=33277
2010-06-21 11:29:54 +00:00
Stig Bjørlykke a0e759ca9b Corrected copyright header.
svn path=/trunk/; revision=33276
2010-06-21 11:28:52 +00:00
Martin Mathieson e530123963 Added volatile to 'offset' (needed by my version of gcc).
svn path=/trunk/; revision=33275
2010-06-21 09:41:57 +00:00
Anders Broman 0ec3d19ef7 The length of the dot11CurrentChannelNumber parameter is 1 octet.
Fixes bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4894

svn path=/trunk/; revision=33274
2010-06-21 03:01:41 +00:00
Guy Harris 0b50e9c953 Properly terminate gmhdr_ftype_timestamp[].
svn path=/trunk/; revision=33273
2010-06-20 22:36:32 +00:00
Guy Harris 15f156c680 Mark pinfo as unused.
svn path=/trunk/; revision=33272
2010-06-20 21:43:52 +00:00
Bill Meier b9d5679284 More rework of the code:
- Refactor to use a separate function for common code;
 - Prefs callback not required;
 - Use val_to_str(...);
 - Fix issues relating to incorrect bytes highlighted in the hex view;

svn path=/trunk/; revision=33271
2010-06-20 21:18:48 +00:00
Jaap Keuter 8bba8bf460 Fix for bug 4888:
Restore setting DSCP column value, when relevant.

svn path=/trunk/; revision=33270
2010-06-20 18:24:25 +00:00
Jaap Keuter a47dfc3efa Fix for bug 4888:
Convert DSCP column to the proper custom column filter code.

svn path=/trunk/; revision=33269
2010-06-20 18:23:35 +00:00
Bill Meier 91431d24f4 Add get_column_visible & set_column_visible
svn path=/trunk/; revision=33268
2010-06-20 16:57:50 +00:00
Stig Bjørlykke d3e1e2df1e Added "Hide Column" functionality.
svn path=/trunk/; revision=33266
2010-06-20 16:23:43 +00:00
Stig Bjørlykke 1069c8dccf Added an expert info for "4 NOP in a row" in IP and TCP.
svn path=/trunk/; revision=33265
2010-06-20 16:22:51 +00:00
Stig Bjørlykke d051e79a81 Revert back to the old Flags entry.
Add number of bits used for Flags in the description.

svn path=/trunk/; revision=33264
2010-06-20 16:17:10 +00:00
Gerald Combs f806bc8743 [Automatic manuf and enterprise-numbers update for 2010-06-20]
svn path=/trunk/; revision=33260
2010-06-20 15:03:42 +00:00
Jaap Keuter e1ea2b1ed0 From Holger Freyther:
The current implementation assumes that the IPA protocol header is three byte.
This is true for TCP but not for packets sent over UDP, which uses four bytes.

From me:
Improve heuristic and offset tracking.

svn path=/trunk/; revision=33259
2010-06-20 14:37:34 +00:00
Jaap Keuter a712e58a94 From KATAOKA Toshihiro:
The sequence number in 3GPP NAS EPS(TS24.301) cyphered PDU is outside of ciphered text.

svn path=/trunk/; revision=33258
2010-06-20 12:21:45 +00:00
Anders Broman 2031cda3df From KATAOKA Toshihiro:
3GPP Diameter S6a flags.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4893
Modified to use tfs_set_notset.

svn path=/trunk/; revision=33257
2010-06-20 10:25:26 +00:00
Stig Bjørlykke 41b8508c73 From tieuthunhi via bug 4887:
Add support for Gigamon headers (timestamp, source port, length, etc)
that are inserted by Gigamon network equipments.

From me:
Various cleanup:
- Register to "eth.trailer" heuristics for trailer.
- Use standard dumping of timestamp.
- Rewrote gmhdr_plfm_str handling.
- Dump srcport details in a subtree.
- Removed packte-gmhdr.h.
- Ensure the while-loop will end.

svn path=/trunk/; revision=33256
2010-06-19 01:43:11 +00:00
Stig Bjørlykke 286aaddb05 Use top level tree when using dissectors from "eth.trailer" heuristics.
svn path=/trunk/; revision=33255
2010-06-19 01:16:29 +00:00
Stig Bjørlykke b0c0ebcc20 Fix the check for disable_lua.
svn path=/trunk/; revision=33252
2010-06-18 15:25:41 +00:00
Martin Mathieson 97df849b98 Add new strings/dissector function for signalling RRC messages that will add
lte_rrc root to the protocol tree. Makes filtering on call signalling easier.

TODO: same for other RRC entry points...

svn path=/trunk/; revision=33251
2010-06-18 07:07:55 +00:00
Anders Broman cd4cfa05ac Add the Gigamon ethertype.
svn path=/trunk/; revision=33250
2010-06-18 04:18:08 +00:00
Guy Harris 6aba7f7109 OK, I checked the Microsoft spec; give some information on that.
svn path=/trunk/; revision=33249
2010-06-18 03:25:33 +00:00
Guy Harris 76dbfe68c5 Expand some comments.
svn path=/trunk/; revision=33248
2010-06-17 21:41:03 +00:00
Bill Meier 59cea681ba Commit re-generated packet-fix.h (which now has $Id$).
(Left out from the previous commit).

svn path=/trunk/; revision=33245
2010-06-17 17:23:44 +00:00
Stig Bjørlykke ba69712a63 Enable Lua by default.
svn path=/trunk/; revision=33243
2010-06-17 16:38:05 +00:00
Martin Mathieson bc020a6d63 Work out better whether RLC segment is a complete upper-layer PDU or not.
svn path=/trunk/; revision=33242
2010-06-17 06:36:23 +00:00
Guy Harris 02ef0696ed Handle 64-bit file offsets in ReadAndX and WriteAndX.
svn path=/trunk/; revision=33240
2010-06-16 20:00:22 +00:00
Guy Harris c81cbe1842 Go back to 64-bit sizes, but, before passing those sizes to
g_try_malloc() or g_try_realloc(), check whether they fit in a gsize
and:

	if not, just pretend the allocation failed;

	if so, cast them to gsize to squelch compiler warnings.

svn path=/trunk/; revision=33239
2010-06-16 18:28:28 +00:00
Stig Bjørlykke eec58bc3e9 Remove C++ comment.
svn path=/trunk/; revision=33238
2010-06-16 17:47:42 +00:00
Stig Bjørlykke 111a5963fe Use gsize for file offset.
svn path=/trunk/; revision=33237
2010-06-16 17:45:25 +00:00
Stig Bjørlykke ed71ce4407 From Hitoshi Irino via bug 4883:
Support NetFlow exported from Cisco ASA5500 series.

From me:
Fixed some hf description entries.

svn path=/trunk/; revision=33236
2010-06-16 15:36:02 +00:00
Guy Harris 11cb04fca6 Export smb_fid_types.
svn path=/trunk/; revision=33234
2010-06-16 07:47:18 +00:00
Stig Bjørlykke 3b042a6055 From Joe Eykholt via bug 4882:
Adds decodes for the FCoE Initialization Protocol features being added for
VN_port to VN_port (VN2VN) point-to-multipoint support. 

svn path=/trunk/; revision=33233
2010-06-16 05:54:11 +00:00
Guy Harris d4cc16d4a1 Handle WTAP_ERR_SHORT_WRITE in file_write_error_message().
In eo_save_entry(), don't assume you can write the entire object in a
single write call - if the object is big enough (which would require a
64-bit address space), and you're not lucky enough to be running on
UN*X (which means LP64, so size_t and ssize_t are big enough for the
entire object), you can't.

svn path=/trunk/; revision=33231
2010-06-16 01:30:29 +00:00
Stig Bjørlykke 560424e4b8 Remove #include <inttypes.h>.
svn path=/trunk/; revision=33228
2010-06-15 15:32:19 +00:00
Stig Bjørlykke e915e93532 From David Perez & Jose Pico from Taddong S.L. via bug 4451:
This functionality keeps track of all SMB objects contained in a capture,
and is able to export to a file a full or partial captured file that has
been transfered through the SMB protocol. In a partial capture, the holes
produced by the non-captured information are filled out with zeros.
It includes the needed modifications of the SMB dissector in the way it keeps
track of the opened SMB files and also to feed the eo_smb tap listener.

svn path=/trunk/; revision=33227
2010-06-15 14:03:49 +00:00