Commit graph

7389 commits

Author SHA1 Message Date
Anders Broman
5856a9e4e3 Add header fields.
svn path=/trunk/; revision=22481
2007-08-10 11:41:28 +00:00
Anders Broman
87dac870ab Register by name.
svn path=/trunk/; revision=22477
2007-08-09 14:47:25 +00:00
Anders Broman
6c161ff927 Packet-imf.c - Offset must be advanced to AFTER CRLF(CRLF).
packet-multipart.c - imf_find_field_end()'s maxlength is last offset in tvb.

svn path=/trunk/; revision=22476
2007-08-09 12:17:56 +00:00
Ulf Lamping
a11feafee6 don't use NULL to initialise an integer
svn path=/trunk/; revision=22474
2007-08-08 23:36:48 +00:00
Ulf Lamping
5c86e7fd4c add pinfo fields clnp_srcref and clnp_dstref to the clnp dissector, similar to the srcport / destport already existing. As simply using srcport / destport for this will confuse mixed protocol usage (like RFC1006 ISOonTCP), I've added explicit clnp fields.
This way, protocols on top of COTP / CLNP have at least a chance to do reassembling correct.

svn path=/trunk/; revision=22473
2007-08-08 22:53:14 +00:00
Ulf Lamping
8ad0c82614 From Markus Seehofer:
A new version of the IEEE1588/PTP dissector. This dissector now includes the
coming version 2 of the standard. It supports both IP/UDP and pure ethernet
frames.
 
I've done some minor changes:
 
LL suffix doesn't work on Win32, used G_GINT64_CONSTANT instead - as described in doc/readme.developer
removed ETHERTYPE_PTP definition, already defined in etypes.h
removed some duplicated "if (tree)"
 

svn path=/trunk/; revision=22472
2007-08-08 20:06:51 +00:00
Anders Broman
16e3bf0476 Add more XCAP application types.
svn path=/trunk/; revision=22471
2007-08-08 19:50:39 +00:00
Anders Broman
aba53f4da7 Wireshark fails to decode the MIME encapsulation part correctly if there is a
"white space" in the Content-Type field before the semi-colon.
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1716
Still does not work correctly as packet-multipart.c seems to have got broken.

svn path=/trunk/; revision=22470
2007-08-08 14:25:17 +00:00
Tomas Kukosa
652b2503c9 add missing initial registration to TCP and SSL ports
svn path=/trunk/; revision=22469
2007-08-08 14:01:28 +00:00
Martin Mathieson
cd47f86da3 Send free-standing generic XML messages -> xml dissector
svn path=/trunk/; revision=22468
2007-08-08 13:12:15 +00:00
Anders Broman
7badbc8eb6 From Daniel Rao:
Implement desegment for SIGCOMP over TCP, similar with HTTP desegment.

svn path=/trunk/; revision=22467
2007-08-08 12:44:28 +00:00
Jaap Keuter
cf95f5ccfd Fix the build
svn path=/trunk/; revision=22466
2007-08-08 07:04:28 +00:00
Luis Ontanon
4238415deb Remove XML heuristic dissector when disabling it.
svn path=/trunk/; revision=22465
2007-08-07 23:07:27 +00:00
Richard van der Hoff
0982bc011c remember to dissect IEs which we rely on elsewhere, even when there is no
packet tree.

svn path=/trunk/; revision=22464
2007-08-07 22:49:31 +00:00
Luis Ontanon
7475efa0f6 from: Mike Duigou
Adds a heur_dissector_delete() function to allow heuristic dissectors to be
dynamically disabled based upon, for example, preference settings.

http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1697


svn path=/trunk/; revision=22463
2007-08-07 21:26:07 +00:00
Luis Ontanon
bc50d5ceb7 Export the entire uat api
svn path=/trunk/; revision=22462
2007-08-07 20:09:18 +00:00
Luis Ontanon
d8e818e9da Make sure that wiretap plugins are loaded before dissectors are (if a new encap type is registered the plugin probably needs it before reg_handoff)
svn path=/trunk/; revision=22461
2007-08-07 20:07:43 +00:00
Ulf Lamping
1bab78bfdf remove an unused variable
svn path=/trunk/; revision=22458
2007-08-06 09:12:18 +00:00
Ulf Lamping
2aef54275a add a way to read a personal /etc/services file for TCP/UDP/... port service name resolution.
svn path=/trunk/; revision=22457
2007-08-06 08:44:26 +00:00
Luis Ontanon
f7cdc0be31 Add preferences to register XML for a TCP port or as a TCP heuristic dissector.
svn path=/trunk/; revision=22454
2007-08-04 14:20:37 +00:00
Guy Harris
a817b2df15 Fix cut-and-pasteo.
svn path=/trunk/; revision=22453
2007-08-04 08:13:22 +00:00
Guy Harris
71070dd6d8 Treat runlex.sh-generated headers differently from Flex-generated .c
files - for one thing, the former aren't compiled into .o or .obj files.

svn path=/trunk/; revision=22452
2007-08-04 08:04:17 +00:00
Guy Harris
5be4499ad1 Add a script as a front-end for Flex, to work around various problems,
such as the fact that Flex strips all but the last component of the "-o"
argument, and that it doesn't generate a header file to declare routines
the generated lexical analyzer defines.  Use that script when building
lexical analyzers, and, for each lexical analyzer, include the generated
header file in the generated analyzer.

svn path=/trunk/; revision=22446
2007-08-04 02:13:52 +00:00
Ulf Lamping
12aed7290c - add PDInterfaceFSUDataAdjust block
- start to implement an AR conversation handler

svn path=/trunk/; revision=22444
2007-08-03 19:29:34 +00:00
Guy Harris
98309a6c83 Squelch a warning.
svn path=/trunk/; revision=22442
2007-08-02 19:07:08 +00:00
Guy Harris
dd86332046 Gak. <> makes it too easy to make these make- scripts do what the rest
do, and take $(srcdir) as the first argument.  Back the previous changes
out, for now.

svn path=/trunk/; revision=22441
2007-08-02 16:06:13 +00:00
Guy Harris
ad76a231d4 We have to include Makefile.common if we move definitions we need
there....

svn path=/trunk/; revision=22440
2007-08-02 08:24:00 +00:00
Guy Harris
4f00d5fcc1 Move the list of source files to a Makefile.common file.
Don't put $(srcdir)/ at the beginning of those file names - other
Makefile.am files don't have it, and it appears to break "make
distcheck", at least on my Mac OS X 10.4 machine.

svn path=/trunk/; revision=22439
2007-08-02 07:54:03 +00:00
Sebastien Tandel
15626ed976 From Amine Dhraief:
there is a mistake in the assigned  number of the update request and update
   ack shim6 control message. Accordingly to draft-ietf-shim6-proto-08 the
   update request has a value of 64 and the update ack 65.


svn path=/trunk/; revision=22438
2007-08-02 02:28:48 +00:00
Guy Harris
46be54cee3 Add a Makefile.nmake.inc file, to hold rules etc. used by multiple
Makefile.nmake files; currently, it has the (F)lex-to-C rule and a
.SUFFIXES pseudo-rule to add .l to the list of suffixes.  Have
Makefile.nmake files with .l.c rules include Makefile.nmake.inc to get
that rule.

The names Makefile.am.inc and Makefile.nmake.inc aren't necessarily the
right names for the files in question.

Use $(PACKAGE) in the Mate plugin's Makefile, rather than "mate".

svn path=/trunk/; revision=22437
2007-08-01 22:20:38 +00:00
Guy Harris
159e795100 Add a Makefile.am.inc file, to hold rules etc. used by multiple
Makefile.am files; currently, it has the (F)lex-to-C rule.  Have
Makefile.am files with .l.c rules include Makefile.am.inc to get that
rule.

svn path=/trunk/; revision=22436
2007-08-01 20:35:05 +00:00
Jaap Keuter
6ab0bbb73c Clean up the WiMax Mac-to-Mac dissector code.
svn path=/trunk/; revision=22435
2007-08-01 17:42:43 +00:00
Guy Harris
61dd46fa9c Use a common .l.c rule for running Flex on .l files, just as is done on
UN*X.

svn path=/trunk/; revision=22434
2007-08-01 00:22:25 +00:00
Guy Harris
3d18eafe0a Export dfilter_macro_build_ftv_cache() for use by Wireshark.
svn path=/trunk/; revision=22429
2007-07-31 01:32:47 +00:00
Luis Ontanon
9865b6346f As per Ulf's request add ${proto.field} macros that will use the value of the given field has in the last selected packet.
svn path=/trunk/; revision=22427
2007-07-30 23:32:47 +00:00
Guy Harris
968d363f11 Add comments to various %option items to explain what they're doing.
Move the %options to the beginning if they weren't already there, and
put them in the same order in all files.

Add "prefix=" options to .l files that don't already have them, so we
don't have to pass a "-P" option.

Add "never-interactive" and "noyywrap" options to our lexical analyzers,
to remove extra isatty() checks and to eliminate the need for yywrap()
from the Flex library.

Get rid of %option nostdinit - that's the default.

Add .l.c: rules to Makefile.am files, replacing the rules for specific
.l files.  Have those rules all check that $(LEX) is set.

Update the address for the FSF.

svn path=/trunk/; revision=22424
2007-07-30 20:22:37 +00:00
Martin Mathieson
0d437580ee Parse EPSV responses (229) & set up FTP-DATA conversation.
svn path=/trunk/; revision=22423
2007-07-30 18:45:48 +00:00
Jeff Morriss
5bf0217530 As requested by Mike Rogovin: register the ICMP dissector by name. For completeness, also register ICMPv6 by name.
svn path=/trunk/; revision=22422
2007-07-30 17:21:40 +00:00
Jeff Morriss
7c4cca3e63 From Florent Drouin:
Correct bug in TCAP statistics when read filter is used.
Rename the TCAP decoding functions to show which are ITU vs. ANSI.
Don't unregister an ITU SSN if it's used by an ANSI subdissector.

svn path=/trunk/; revision=22421
2007-07-30 17:10:20 +00:00
Jaap Keuter
9636fdfefd Fix for bug 1712:
RFC 4627 defines "The application/json Media Type for JavaScript Object Notation (JSON)" 
application/json is a text based type used by JavaScript applications and web pages.

svn path=/trunk/; revision=22420
2007-07-30 13:06:01 +00:00
Tomas Kukosa
7f02fcd555 RNSAP updated to V7.5.0 (2007-06)
svn path=/trunk/; revision=22419
2007-07-30 12:08:38 +00:00
Tomas Kukosa
beffad7887 add forgotten files
svn path=/trunk/; revision=22418
2007-07-30 08:22:22 +00:00
Tomas Kukosa
5a46ea46b5 H.450 regenerated from original ASN.1 sources
svn path=/trunk/; revision=22417
2007-07-30 08:01:59 +00:00
Jeff Morriss
29facf8ff9 From Florent Drouin:
- add support of session management for tcap ANSI.
   (In fact, this support already exist for ANSI MAP subdissector, but as our
   simulators can reuse the tcap transaction Id, the decoding of the response
   may be wrong)
- move the code related to asn1 in tcap.cnf, and update tcap.cnf
- move the code related to the session management in tcap-persistentdata
- add a compilation option to free the entry in the hashtable for a closed
  transaction. This is used only for tshark statistics generation, with huge file.
- cleanup and add some comments

Add Id tags to epan/tcap-persistentdata.{c,h}

svn path=/trunk/; revision=22415
2007-07-27 19:24:40 +00:00
Martin Mathieson
c539ff38ef Check the length in unsigned32 AVP data fields.
svn path=/trunk/; revision=22413
2007-07-27 18:32:09 +00:00
Jeff Morriss
0c6ea016ea Add fetch_tapped_data
svn path=/trunk/; revision=22412
2007-07-27 14:22:47 +00:00
Tomas Kukosa
e5922df225 - use #.FN_HDR where #.FN_BODY is not necessary
- modify subtypes for individual TCMessage/ansi... fields instead of switching based on hf_index inside common TransactionPDU type

svn path=/trunk/; revision=22411
2007-07-27 06:23:45 +00:00
Jeff Morriss
45ee7230cc Change a bunch of calls to col_append_*() to col_add_*() in places where we
_want_ what's currently in the INFO column (usually a more generic message
type from a lower level dissector) replaced (usually with a more
specific--higher level--message type from the currect dissector).  Add a
comment there not to change it back and to explain the use of col_set_fence()
in case someone finds data there that they _don't_ want replaced.

svn path=/trunk/; revision=22409
2007-07-26 20:05:54 +00:00
Jeff Morriss
1af3ee0936 Check COL_INFO before calling col_set_fence(..., COL_INFO) rather than COL_PROTOCOL
svn path=/trunk/; revision=22408
2007-07-26 19:27:22 +00:00
Tomas Kukosa
b104611590 remove unused variable
svn path=/trunk/; revision=22407
2007-07-26 14:31:38 +00:00
Tomas Kukosa
82ea2908f1 - export some ASN.1 functions from libwireshark
- fill-in actx->created_item in dissect_ber_object_identifier()

svn path=/trunk/; revision=22406
2007-07-26 14:00:48 +00:00
Graeme Lunt
bd559bc7e5 Small cosmetic change to show Named Property name.
svn path=/trunk/; revision=22402
2007-07-25 19:11:02 +00:00
Jaap Keuter
44b31f98f3 From Francois-Xavier Le Bail:
The following patch decodes DHCP option 121. (RFC 3442)

svn path=/trunk/; revision=22399
2007-07-24 21:23:55 +00:00
Anders Broman
61fb0c84d2 From Florent Drouin:
- add a subtree to the ApplyChargingXX Report
- add a subtree to ReleaseCall and ReleaseSMS
- synchronize Unix and Windows makefile.

svn path=/trunk/; revision=22396
2007-07-24 17:20:44 +00:00
Tomas Kukosa
8334a43855 QSIG extended with SYNC-SIG operations (ECMA-245)
svn path=/trunk/; revision=22394
2007-07-24 07:37:10 +00:00
Jeff Morriss
e705b7335b (sigh): move packet-bacapp, packet-diameter, and packet-sctp back out of CLEAN_DISSECTOR_SRC. Next time: check the compile logs on the buildbots _before_ experimenting
svn path=/trunk/; revision=22393
2007-07-24 00:44:07 +00:00
Jeff Morriss
62330a8c8b Getting brave (or foolish?): move packet-bacapp, packet-cops, packet-diameter, and packet-sctp to CLEAN_DISSECTOR_SRC
svn path=/trunk/; revision=22392
2007-07-23 23:29:36 +00:00
Anders Broman
ba2549b83a Fix bug
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1699 Bad decoding of Camel PromptAndCollectUserInfo

By fixing up the generation of HF vars for Arg etc

Add an OID name to INAP.

svn path=/trunk/; revision=22391
2007-07-23 23:02:54 +00:00
Jeff Morriss
43966696b9 Move packet-isup to CLEAN_DISSECTOR_SRC--it compiles cleanly for me.
svn path=/trunk/; revision=22390
2007-07-23 22:38:57 +00:00
Ulf Lamping
3b509e89ae - add a column for the expert info severity level
- fix a column related bug introduced in SVN 20118

svn path=/trunk/; revision=22387
2007-07-23 20:11:05 +00:00
Ulf Lamping
a770cf59a3 show the number of fragment bytes in the info column
svn path=/trunk/; revision=22384
2007-07-23 20:06:03 +00:00
Jeff Morriss
c6d7440be1 From Marc Petit-Huguenin: this is an update to the STUN2 dissector using the
last draft, draft-ietf-behave-rfc3489bis-07.  Changelog:

* My employer is now sponsoring this work, so added a copyright line.
* Added a comment for each method/attribute with the RFC/I-D where is
  it defined, so it will be easier to add new STUN usages.
* Removed the SHARED-SECRET method.
* Removed the PASSWORD and REFRESH-INTERVAL attributes.
* Changed "Response" to "Success Response".
* Changed "Error Reason Phase" to "Error Reason Phrase".
* Added reassembly for TCP segments on STUN2.
* Updated STUN acronym expansion.
* Renamed STUN2_ERROR to ERROR_RESPONSE.
* Changed the value of attribute FINGERPRINT from 0x8025 to 0x8028.
* Display if an unknown attribute is comprehension-optional or
  comprehension-required.
* Reorganized order of attributes in the dissector code.
* The message length is now displayed in decimal.

svn path=/trunk/; revision=22383
2007-07-23 19:32:40 +00:00
Martin Mathieson
59c8ec0670 Make contributing items and hdr extensions proper fields.
svn path=/trunk/; revision=22382
2007-07-23 14:39:17 +00:00
Luis Ontanon
3764b345b3 register dissect_eth_maybefcs as "eth" users might find it useful.
svn path=/trunk/; revision=22381
2007-07-22 16:44:25 +00:00
Luis Ontanon
6c31e5fc14 Fix documentation comments
svn path=/trunk/; revision=22373
2007-07-21 18:23:08 +00:00
Jeff Morriss
3b6cd9fc91 From Ted Percival: Support for PA-S4U2Self Kerberos packet type based on ASN.1
description in Heimdal.

svn path=/trunk/; revision=22364
2007-07-20 18:57:02 +00:00
Martin Mathieson
3e62d049de - add an all_cmds array for looking up 'RFC' packets
- improve error/expert info when see unmatched AVPs, commands, appids

svn path=/trunk/; revision=22363
2007-07-20 11:39:09 +00:00
Tomas Kukosa
3b5c406f8c QSIG fully implemented
svn path=/trunk/; revision=22361
2007-07-20 09:54:47 +00:00
Luis Ontanon
5e290061f2 - <?avp-proto and <?type-proto to instruct about which dissector to use for a given type or avp
- dissect timestamps
- add all the avps that were commented out in the dictionary


svn path=/trunk/; revision=22360
2007-07-20 00:15:17 +00:00
Jeff Morriss
fae881dc45 Put register_dissector() call back in
svn path=/trunk/; revision=22359
2007-07-19 15:11:34 +00:00
Jeff Morriss
a6dd859454 For LEGO: Use crypt_tvb when we don't have cleartext_tvb
svn path=/trunk/; revision=22358
2007-07-19 14:04:56 +00:00
Jeff Morriss
81e2b4b66e Change "lenght" to "length", this time in the *source* of the SNMP dissector (sigh)
svn path=/trunk/; revision=22357
2007-07-19 13:43:36 +00:00
Jeff Morriss
794a933a2c Change "lenght" to "length" and "decypt" to "decrypt"
svn path=/trunk/; revision=22356
2007-07-19 13:05:39 +00:00
Tomas Kukosa
9dad88f94b get rid of few warnings
svn path=/trunk/; revision=22355
2007-07-19 12:31:01 +00:00
Tomas Kukosa
17feb32ca9 change QSIG tables structure so as they can be generated automatically from ASN.1 in the next step
svn path=/trunk/; revision=22354
2007-07-19 11:41:10 +00:00
Bill Meier
71209c200f Fix two Windows compile warnings
svn path=/trunk/; revision=22353
2007-07-18 15:07:45 +00:00
Tomas Kukosa
3f0e5022e2 remove packet-q932-ros.h
svn path=/trunk/; revision=22352
2007-07-18 14:12:56 +00:00
Martin Mathieson
b0d92aeb98 Initialise description field to avoid crash when dumping dictionary.
svn path=/trunk/; revision=22351
2007-07-18 13:22:11 +00:00
Martin Mathieson
0a759fa734 Minor changes to expert items
svn path=/trunk/; revision=22350
2007-07-18 13:18:41 +00:00
Tomas Kukosa
ab5d466fc7 rose_ctx_t structure usage in Q.932 dissector
svn path=/trunk/; revision=22349
2007-07-18 13:15:36 +00:00
Luis Ontanon
54a9c2e94e add license
svn path=/trunk/; revision=22348
2007-07-18 08:25:09 +00:00
Michael Tüxen
06ff527c5b Make debugging static.
svn path=/trunk/; revision=22347
2007-07-18 07:06:46 +00:00
Luis Ontanon
f1c5a7c55b fxi a ytpo
svn path=/trunk/; revision=22346
2007-07-18 00:19:37 +00:00
Luis Ontanon
e27b40f589 Add Address decoding, two debug environment variables (WIRESHARK_DEBUG_DIAM_DICT_PARSER and WIRESHARK_DUMP_DIAM_DICT) and fix some issues pointed out by Martin
svn path=/trunk/; revision=22345
2007-07-17 22:19:54 +00:00
Luis Ontanon
776820f3fb (Following my "tradition") I forgot to ci the changes to the Makefiles for crc6 and crc10
svn path=/trunk/; revision=22344
2007-07-17 22:11:07 +00:00
Luis Ontanon
144ca8491d fix a leak
svn path=/trunk/; revision=22343
2007-07-17 22:09:10 +00:00
Luis Ontanon
b8258e4a36 increase line numbers on comments too
svn path=/trunk/; revision=22342
2007-07-17 22:05:18 +00:00
Luis Ontanon
e1ed3a1b8d get crc10 and crc6 out of packet-iuup.c
- experimental code for a way-too-heurstic look for iuup dissector


svn path=/trunk/; revision=22341
2007-07-17 22:04:00 +00:00
Luis Ontanon
fc98b36914 Have the encapsulation selection match on the port name as well as stk filename.
svn path=/trunk/; revision=22340
2007-07-17 22:00:40 +00:00
Stephen Fisher
d1357063ae From Jess Balint:
a patch to fix the state management for the MySQL protocol dissector.


svn path=/trunk/; revision=22339
2007-07-17 21:50:29 +00:00
Gerald Combs
01567eb9f4 If we can't find dictionary.xml, fail instead of trying to read from
stdin (which makes distcheck unhappy).  Fixup whitespace.

svn path=/trunk/; revision=22338
2007-07-17 21:29:18 +00:00
Guy Harris
d38d3652d9 "key" is a guint8 *; make the pointer into the string to which it refers
a guint8 * as well - that keeps us from sign-extending the characters
before passing them to the ctype.h macros.

svn path=/trunk/; revision=22337
2007-07-17 19:09:50 +00:00
Jeff Morriss
a1c34d30c8 Don't use g_ascii_isupper() nor g_ascii_tolower(): they don't exist in GTK1. Replaced with generic isupper() and tolower().
svn path=/trunk/; revision=22336
2007-07-17 18:56:09 +00:00
Martin Mathieson
355d1e1321 Show malformed SDP line as an expert item
svn path=/trunk/; revision=22334
2007-07-17 13:09:44 +00:00
Martin Mathieson
6bbe9bd5d6 Avoid an infinite loop (on malformed packet)
svn path=/trunk/; revision=22333
2007-07-17 11:54:22 +00:00
Jaap Keuter
8cb4cc6aaf Fix for bug 1616:
ICMPv6 & UDP w/IPv6 checksum with a routing header fixed using the routing header address now.

svn path=/trunk/; revision=22331
2007-07-17 07:01:36 +00:00
Stephen Fisher
a1f317de36 From Kevin A. Noll via private bug #1683:
This is a major re-write of the WLCCP version 0xc1 dissector. It now is
able to dissect many more WLCCP message types and the TLVs that may be
included in a message. Placeholders are left for message types and
TLV types that we do not currently have enough data to engineer a
dissector.


svn path=/trunk/; revision=22330
2007-07-17 06:21:15 +00:00
Jeff Morriss
520296ca02 Fix bug http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1675 (warning: cast from pointer to integer of different size) and, presumably, display of PER encoded IPv4 addresses by copying the IP address into a guint32 and passing that to proto_tree_add_ipv4().
svn path=/trunk/; revision=22328
2007-07-16 21:37:07 +00:00
Luis Ontanon
e8b9920f58 Fix distcheck
svn path=/trunk/; revision=22324
2007-07-16 17:39:40 +00:00
Luis Ontanon
81d168b14c Glibize diam_dict.l (should fix windows config)
svn path=/trunk/; revision=22323
2007-07-16 17:27:51 +00:00
Tomas Kukosa
e7a40dbb61 make TCP and SSL/TLS ports configurable for HTTP
svn path=/trunk/; revision=22322
2007-07-16 12:51:42 +00:00
Luis Ontanon
cf526583e8 for MSVC (vendor_flag ? 12 : 8) is signed ...
well for gcc is either signed or unsigned (they are two literals!)


svn path=/trunk/; revision=22321
2007-07-16 06:28:56 +00:00
Luis Ontanon
ae48b50f17 Windows too needs diam_dict.c
svn path=/trunk/; revision=22320
2007-07-16 06:06:21 +00:00
Luis Ontanon
4bf105dd0f update Makefiles to build diam_dict.[co]
svn path=/trunk/; revision=22319
2007-07-16 05:43:46 +00:00
Luis Ontanon
b0bd83c868 Rewrite of the diameter dissector to use the dictionary for creating hfids, drop libxml dependency.
The work is still incomplete (anything but strings and numbers appears as bytes) but I want others to start testing it.

TODO:
builders and decoders for:
- (ntp) timestamps
- addresses
- diameteruris
- diameteridentities
- ipfilterrules
- qosfilterrules
- mipregistrationrequests


svn path=/trunk/; revision=22318
2007-07-16 05:41:58 +00:00
Graeme Lunt
24a91cfc09 Add packet-imf.h
svn path=/trunk/; revision=22315
2007-07-14 12:52:51 +00:00
Graeme Lunt
4d0f66a26f Further problem highlighted by OSX.
svn path=/trunk/; revision=22314
2007-07-14 10:15:52 +00:00
Graeme Lunt
d23237ab38 Fix for warnings on OSX.
svn path=/trunk/; revision=22313
2007-07-14 09:58:08 +00:00
Graeme Lunt
3347aa9950 New dissector for Transport-Neutral Encapsulation Format - TNEF.
TNEF is a Microsoft defined format for carrying additional information about a message (e.g. rich text formatting)
and generally appears as a "winmail.dat" attachment. Details are here:

http://msdn2.microsoft.com/en-us/library/ms530652.aspx

This is a basic dissector which handles the TNEF attributes and the MAPI properties (found in MAPIPROPS
TNEF attribute). It is not complete and requires further work to complete the dissection. However it will
dissect TNEF generated from Outlook (including messages with attachments).

It is registered under the appropriate BER OID (1.2.840.113556.3.10.1) for X.400 attachments and media 
type ("application/ms-tnef") for MIME messages. For MIME messages, any content-transfer-encoding
(usually base64) needs to be removed before calling this dissector. There is a preference in the 
MIME multipart dissector to do this. 


svn path=/trunk/; revision=22312
2007-07-14 09:53:30 +00:00
Graeme Lunt
7b1032f9b0 Optional removal of any base64 content-transfer-encoding from a MIME
body before passing it to a sub-dissector. The decoded content is added 
as a new source, named with the filename or the content-type.


svn path=/trunk/; revision=22311
2007-07-14 09:19:35 +00:00
Graeme Lunt
b1a3d8a5a0 Expose a function (imf_find_field_end()) and
make the field format dissection case-insensitive.

svn path=/trunk/; revision=22310
2007-07-14 09:15:02 +00:00
Graeme Lunt
cf24e2c104 Allow the base64 decoding to cope with lines broken with \r\n.
svn path=/trunk/; revision=22309
2007-07-14 09:12:38 +00:00
Graeme Lunt
fc842e9933 Dissection of octet-aligned EXTERNALs.
svn path=/trunk/; revision=22308
2007-07-14 08:21:58 +00:00
Graeme Lunt
406b6bb630 From Stig Bjorlykke.
ExtendedBodyPart parameters are OPTIONAL.


svn path=/trunk/; revision=22307
2007-07-14 08:16:43 +00:00
Guy Harris
fad7133f81 Fix yet more casts of ctype.h macro arguments - and fix some cases where
we were passing an uncasted "char" to those macros.

svn path=/trunk/; revision=22306
2007-07-14 00:37:01 +00:00
Anders Broman
b2b6df139c Fix bug
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1640 change "Change-Filter-Request (43)" to "CoA-Request (43)"

svn path=/trunk/; revision=22301
2007-07-13 20:00:38 +00:00
Anders Broman
222ed488b0 From Florent DROUIN:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1652
patch to correct the decoding of Calling Party Number, and
Called Party Number, when an implicit tag is used.

svn path=/trunk/; revision=22299
2007-07-13 14:46:21 +00:00
Jeff Morriss
10dcbaa760 From Florent Drouin: fix for bug http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1681 : initialize the variable containing the OID so the dialog portion gets decoded properly
svn path=/trunk/; revision=22298
2007-07-13 13:45:11 +00:00
Tomas Kukosa
6659588f60 - get rid of anonymous unions
- move some structures from packet-per and packet-q932-ros to asn1.h

svn path=/trunk/; revision=22295
2007-07-13 11:25:53 +00:00
Jeff Morriss
25df9f2133 From Guillem Hernandez: fix decoding of EOSP bit. From Jaap Keuter: fix description of 'value' in proto_tree_add_boolean() that caused the former bug.
svn path=/trunk/; revision=22293
2007-07-12 22:36:35 +00:00
Martin Mathieson
ecc4b9ad06 Fix parsing of sctpprim header (v1)
svn path=/trunk/; revision=22290
2007-07-12 17:31:26 +00:00
Jeff Morriss
df2472cb41 Undo part of rev 21460: go back to passing proto_ssl to the tap (since apparently follow ssl stream uses it) but now cast it using GINT_TO_POINTER so as to avoid a warning (seen on 64-bit Redhat AS4) about casting to a pointer from an integer of different size. It does not appear that there is a DTLS tap (which is the other thing changed in 21460).
svn path=/trunk/; revision=22289
2007-07-12 15:34:21 +00:00
Gerald Combs
90975ad053 Move packet-ipsec.c to CLEAN_DISSECTOR_SRC.
svn path=/trunk/; revision=22287
2007-07-11 18:23:54 +00:00
Gerald Combs
24238df617 Add a missing display filter.
svn path=/trunk/; revision=22285
2007-07-10 23:23:09 +00:00
Martin Mathieson
11cd484b8f Allow filtering of whole AVP
svn path=/trunk/; revision=22284
2007-07-10 17:45:11 +00:00
Jaap Keuter
a9ed13c1d1 Fix reserved bits bitmask.
svn path=/trunk/; revision=22282
2007-07-10 05:15:45 +00:00
Gerald Combs
0ed707468e From Dustin Johnson: Fix a typo.
svn path=/trunk/; revision=22280
2007-07-09 17:01:00 +00:00
Martin Mathieson
afb016cc87 - Fix a broken comment in xml file
- Add/fix some AVPs
- Print unmatched command codes in decimal

svn path=/trunk/; revision=22275
2007-07-09 13:27:15 +00:00
Ronnie Sahlberg
b363b1664d dissect lsa_Strings correctly in the samr dissector
svn path=/trunk/; revision=22274
2007-07-09 13:05:52 +00:00
Ronnie Sahlberg
58bc100096 the sidtype is a 32bit enum not a standard enum
svn path=/trunk/; revision=22273
2007-07-09 12:50:57 +00:00
Ronnie Sahlberg
43010b965b make all rids use a single hf filter field
dissect the Type of rid using lsa_Types


svn path=/trunk/; revision=22272
2007-07-09 12:37:20 +00:00
Ronnie Sahlberg
0b3695ea9b disabling sid snooping in the code
this module was never really finished and was therefore semi-useless.
disabled now since the change to samr broke it  and the real fix to 
unbreak it would be a substantial rewrite of it
(and adding a nice gui so one can see which sids are mapped...)

disabled it   but did not remove it since i do think the module is 
useful   IF it is completed with a lot more operations.



svn path=/trunk/; revision=22271
2007-07-09 11:04:38 +00:00
Ronnie Sahlberg
824b7f0a25 rename all policy handles in samr to have a name that describes the type
of handle.



svn path=/trunk/; revision=22270
2007-07-09 10:49:34 +00:00
Anders Broman
a655815efa ACP123 with -X and -T option
svn path=/trunk/; revision=22269
2007-07-08 14:38:07 +00:00
Ronnie Sahlberg
654b6075af bug 1550
add a fix for ack/seq tracking when the tcp is broken and sends a 
non-zero ack field for SYN packets.

add a warning to the dissect pane that illustrates that these are broken 
packets
 


svn path=/trunk/; revision=22267
2007-07-07 22:27:22 +00:00
Anders Broman
593548ef6b Make hf fileds for ARGGUMENT RESULT and ERROR parameters.
svn path=/trunk/; revision=22266
2007-07-07 22:24:37 +00:00
Ronnie Sahlberg
543f686d6c add the new pidl created SAMR dissector
svn path=/trunk/; revision=22265
2007-07-07 21:47:27 +00:00
Ronnie Sahlberg
f031e11770 fix a typo
svn path=/trunk/; revision=22264
2007-07-07 03:34:30 +00:00
Ronnie Sahlberg
ca8fd4031d add some more access masks
svn path=/trunk/; revision=22263
2007-07-07 01:25:26 +00:00
Jaap Keuter
b002a79472 From Steve Karg:
Attached is a patch that fixes bug 1670 and related issues.
For the BACnet GetEventInformation-ACK request dissector:
1. Corrected BitString decoding for acknowledgedTransitions and eventEnable.
2. Corrected the ability to decode more than one event.
3. Grouped each item of the sequence using subtrees.  Added more informative
text to Priority and Timestamp.
4. Corrected eventState to use BACnetEventState enumeration instead of
BACnetEventStateFilter.

svn path=/trunk/; revision=22262
2007-07-06 22:36:58 +00:00
Ronnie Sahlberg
58db64e69f add dissection of the bits for the Connect[0-5] access_masks
svn path=/trunk/; revision=22260
2007-07-06 22:14:04 +00:00
Anders Broman
13ed09da5b From Nicolas Dichtel:
First patch is only to reindent the packet-mip6 files.
Second patch adds PMIPv6 options (draft-ietf-netlmm-proxymip6-01.txt) and Mobile Node Identifier Option (RFC4283).

svn path=/trunk/; revision=22258
2007-07-06 10:07:25 +00:00
Anders Broman
361006501b From Seehofer, Markus:
ETHERTYPE for IEEE1588/PTP

svn path=/trunk/; revision=22257
2007-07-06 10:03:19 +00:00
Ronnie Sahlberg
a0fbebed71 some more prettification, show name of created users on the summary
line and also in the associated policy handle


svn path=/trunk/; revision=22256
2007-07-06 05:45:55 +00:00
Ronnie Sahlberg
5830fd55bc redo the lsa_String dissector we temporarily host in samr until lsa has
been pidlified

prettify some strings and show them in the summary line


svn path=/trunk/; revision=22255
2007-07-06 04:05:06 +00:00
Ronnie Sahlberg
a1fa757734 add policy handle tracking to samr.cnf
svn path=/trunk/; revision=22254
2007-07-05 22:19:28 +00:00
Ronnie Sahlberg
ab81a16892 add initial samr idl and conformance file
svn path=/trunk/; revision=22252
2007-07-05 22:01:58 +00:00
Anders Broman
601892260c Try to get rid of the warnings.
svn path=/trunk/; revision=22250
2007-07-05 21:29:53 +00:00
Graeme Lunt
2d671eadbd Consistent eol-style restored.
svn path=/trunk/; revision=22248
2007-07-05 16:31:12 +00:00
Graeme Lunt
ce458040ac Allow for leading whitespace in parameters when looking for the boundary.
svn path=/trunk/; revision=22246
2007-07-05 16:19:36 +00:00
Anders Broman
9f5e016fff New Camel dissector built with -X and -T option and origninal ASN1 files.
svn path=/trunk/; revision=22245
2007-07-05 13:18:28 +00:00
Anders Broman
379d320b8b From Stig Bjørlykke:
This patch adds an option to packet-ber to show unexpected tags/data as unknown BER.  It also fixes some offset/length combinations when adding the error message to the tree.

svn path=/trunk/; revision=22244
2007-07-05 13:14:25 +00:00
Martin Mathieson
64ecf611c4 Make timestamp a double to make filtering more useful.
svn path=/trunk/; revision=22243
2007-07-05 09:58:09 +00:00
Martin Mathieson
b9ac488c45 Make lines of raw SIP filterable. Fix a little whitespace.
svn path=/trunk/; revision=22242
2007-07-04 17:27:46 +00:00
Graeme Lunt
14e67d04bc New dissector for Internet Message Format (IMF) - RFC 2822.
It provides basic dissection of the text-based protocol, providing fields for filtering.
It also calls the multipart dissector for any MIME body that is found.
It includes very basic support for MIXER (RFC 2156) fields.
It also registers itself as "message/rfc822" in the media type table.


svn path=/trunk/; revision=22241
2007-07-04 16:24:20 +00:00
Graeme Lunt
1066b988e6 New preference to allow for the reassembly of SMTP DATA and subsequent dissection as Internet Message Format (imf).
(imf dissector in separate patch).


svn path=/trunk/; revision=22240
2007-07-04 16:16:32 +00:00
Anders Broman
de416e9532 Preparations for updated CAMEL dissector.
svn path=/trunk/; revision=22239
2007-07-04 13:27:44 +00:00
Ronnie Sahlberg
69a35c3c47 relax the checking of [PG] PORTAL IP ADDRESS, some implementations are
apparently broken and send 64 bytes for these fields.

mark these packets in the decode pane that the isns host is broken


change the calculation of offset to just increment it by tag size  len 
size and length one at the very end of the attribute dissector



svn path=/trunk/; revision=22236
2007-07-03 13:05:33 +00:00
Ronnie Sahlberg
960af5e5ba dissect a new AD-IF-RELEVANT type seen in some vista traces
it is essentially 

Checksum ::= SEQUENCE {
   type     [0] INTEGER  # -138 == HMAC-MD5
   checksum [1] OCTET STRING
}

SignTicket ::= SEQUENCE {
   enctype   [0] INTEGER
   signature [1] Checksum
}



svn path=/trunk/; revision=22235
2007-07-03 12:02:16 +00:00
Anders Broman
44a41824c3 Fix dissection of IP addresses in unaligned PER.
Add dissection of MSISDN and IMSI to the ULP dissector.

svn path=/trunk/; revision=22233
2007-07-03 09:08:31 +00:00
Tomas Kukosa
a41f5ff693 ARGUMENT and RESULT types of OPERATION can be used with new asn2wrs and need not to be redefined as assignment
svn path=/trunk/; revision=22231
2007-07-02 12:25:13 +00:00
Anders Broman
94a699a583 Fix some of the 'defined but not used' warnings.
svn path=/trunk/; revision=22229
2007-07-02 12:12:49 +00:00
Anders Broman
04138a1353 Correct a copy paste error and rename fields.
svn path=/trunk/; revision=22228
2007-07-02 09:20:19 +00:00
Anders Broman
42f17b2111 Try to fix defined but not used warnings and use the nice new table function to get the
list of Opcodes.

svn path=/trunk/; revision=22227
2007-07-01 18:48:15 +00:00
Jaap Keuter
a286ab2d9b Fix for bug 1585:
Add new frame types for IAX protocol and modem subclass dissection.

svn path=/trunk/; revision=22226
2007-06-29 19:00:46 +00:00
Martin Mathieson
1d477c802c - Map gre -> IP
- Change a value string value to help an easily-frightened colleague

svn path=/trunk/; revision=22224
2007-06-29 16:16:57 +00:00
Jaap Keuter
9295f8a88c Fix for bug 1669:
Don't ditch the returned offset.

svn path=/trunk/; revision=22220
2007-06-28 19:03:47 +00:00
Guy Harris
126dedd9b2 I think David Young needs to be granted the power of life and death
over anybody who edits the sys/net80211/ieee80211_radiotap.h header on
any operating system.  I also think he needs to be willing to use that
power when necessary.

svn path=/trunk/; revision=22217
2007-06-27 23:53:24 +00:00
Gerald Combs
d75af45adc Make the WPA passphrase a percent-escaped string. Constify and GLib-ize
some variables.

svn path=/trunk/; revision=22210
2007-06-27 19:02:58 +00:00
Graeme Lunt
12af6d79bc This patch will set correct extension_id for ExtensionAttributeType
(error introduced in r22043), and fix printing of CAP values in
oraddress (error introduced in r22054).


svn path=/trunk/; revision=22209
2007-06-27 18:03:23 +00:00
Graeme Lunt
1763f7caa3 This patch adds a check for octet string in RTSE reassembly.
If not an octet string the data is handled as ordinary RTSE APDU.


svn path=/trunk/; revision=22208
2007-06-27 17:57:44 +00:00
Graeme Lunt
473077719e This patch make PRES context identifiers conversation aware.
svn path=/trunk/; revision=22207
2007-06-27 17:51:19 +00:00
Graeme Lunt
4c05398910 This patch changes ExemptedAddressSeq to a SEQUENCE OF.
svn path=/trunk/; revision=22206
2007-06-27 17:42:41 +00:00
Anders Broman
9c90bbd256 Fix distcheck
svn path=/trunk/; revision=22205
2007-06-27 17:03:25 +00:00
Anders Broman
32d0349b54 Try to fix the last defined but not used warnings(again).
svn path=/trunk/; revision=22204
2007-06-27 17:02:47 +00:00
Tomas Kukosa
b08ff956bc export prefs_register_static_text_preference()
svn path=/trunk/; revision=22201
2007-06-27 06:54:48 +00:00
Anders Broman
85b3120a7d Try to fix the last defined but not used warnings.
svn path=/trunk/; revision=22196
2007-06-26 20:49:21 +00:00
Gerald Combs
0c4cb64c57 Add capture counts for PPI.
svn path=/trunk/; revision=22195
2007-06-26 19:38:44 +00:00
Anders Broman
abf8df1d03 Try to fix some GCC warnings
svn path=/trunk/; revision=22194
2007-06-26 17:10:05 +00:00
Jaap Keuter
9142a7a242 Fix for bug 1658:
Add Do Not Age bit interpretation.

svn path=/trunk/; revision=22193
2007-06-26 07:02:48 +00:00
Jaap Keuter
71db7e37ac From Lukazs M.:
Small patch for packet-edonkey.c (stupid mistakes are the easiest to made :-))

svn path=/trunk/; revision=22192
2007-06-25 20:47:45 +00:00
Anders Broman
f6e12b2533 From Flavio Leitner:
Fix IPMI Completion Codes.

svn path=/trunk/; revision=22191
2007-06-25 19:51:23 +00:00
Stephen Fisher
de9f69f58a From Frank Stratemeier:
I added rval_to_str, match_strrval and match_strrval_idx to
libwireshark.def for being available in plugins.


svn path=/trunk/; revision=22189
2007-06-25 19:29:02 +00:00
Anders Broman
2e693964c6 Generate CMIP from original asn1 files with -X and -T option.
svn path=/trunk/; revision=22187
2007-06-25 18:40:17 +00:00
Gerald Combs
452d9b91e7 Fix logic to properly ignore (for now) encrypted keys and group keys.
svn path=/trunk/; revision=22186
2007-06-25 18:22:36 +00:00
Tomas Kukosa
c2172dbc5b - fix field type FT_... for SelectionType
- fix OPTIONAL handling in CLASS definition
- Q.932 ROS regenerated

svn path=/trunk/; revision=22184
2007-06-25 08:58:27 +00:00
Anders Broman
5e339afc28 From Martin Peylo:
Changes are only for protocol version 2.

The changes are:
- dissect "TIPC Bundler Protocol" messages correctly
- search for other dissectors which want to dissect encapsulated data according to the TIPC user or TIPC type of a message. The data dissection is difficult since a TIPC data message does not necessarily a "type" set. So for the moment - while TIPC is not widely used - just triggering for the user of a message will be sufficient for people looking into the TIPC protocol.
- "Dissect TIPC data" in the preferences is now switched on by default
- to show undissected data, the "data" dissector is now used.
- corrected some typos

svn path=/trunk/; revision=22183
2007-06-25 06:10:36 +00:00
Ronnie Sahlberg
45b5adb97b remove some compiler warning due to unused pinfo parameter
a SASL encapsulated ldap blob can contain more than one LDAP message so 
the rest_is_pad parameter is bogus and thus removed.

make dissect_ldap_pdu handle when we have more than one LDAP message 
inside one sasl blob


svn path=/trunk/; revision=22181
2007-06-24 17:23:55 +00:00
Anders Broman
05b30163e2 Try to fix some more GCC warnings.
svn path=/trunk/; revision=22180
2007-06-24 09:18:36 +00:00
Graeme Lunt
ba986f3f05 Consolidation of FTBP dissector into the X420 dissector.
svn path=/trunk/; revision=22178
2007-06-24 08:23:26 +00:00
Anders Broman
c9e31101a1 Export fragment_end_seq_next to get the Windows buildbot going again.
svn path=/trunk/; revision=22177
2007-06-24 08:13:11 +00:00
Graeme Lunt
21209f9b5b This patch adds RTSE reassembly. The reassembly is done when
receiving a SES MAJOR SYNC POINT, as this indicates the end of the
COTP DT Data stream.  Previous the RTSE dissector was called when
receiving a COTP DT Data fragment with the "last data unit" bit set,
but this does not work with messages fragmented in RTSE.  Reassembly
can be turned off in the preferences.


svn path=/trunk/; revision=22176
2007-06-24 05:28:27 +00:00
Graeme Lunt
124ef66685 This patch adds s4406 type to COL_INFO, as for X420.
svn path=/trunk/; revision=22175
2007-06-24 05:22:09 +00:00
Graeme Lunt
2033b06cda Added a new function, fragment_end_seq_next(), to end the
fragmented data without adding an empty data fragment. 
This is used by the RTSE dissector which can't identify the 
last fragment until after it has been added.


svn path=/trunk/; revision=22174
2007-06-24 05:14:39 +00:00
Graeme Lunt
104f8ebe46 This patch fixes reassembly when receiving a SES MINOR SYNC POINT and a
COTP DT Data (class 1) fragment in the same frame.  Also added the
generated dst_ref and a reference to the "COTP segment data" to the
tree.


svn path=/trunk/; revision=22173
2007-06-24 05:09:42 +00:00
Anders Broman
58dd15575f Try to fix some GCC warnings.
svn path=/trunk/; revision=22172
2007-06-23 15:32:36 +00:00
Anders Broman
442538ce0b Fix a typo.
svn path=/trunk/; revision=22171
2007-06-23 15:31:37 +00:00
Gerald Combs
4944cdc899 A recent checkin broke wpa-psk keys; fix it.
svn path=/trunk/; revision=22169
2007-06-23 00:00:57 +00:00
Ronnie Sahlberg
35f3ff0246 add code to handle new insanity in how spnego and gss wrap
eachother



svn path=/trunk/; revision=22165
2007-06-22 19:32:02 +00:00
Ronnie Sahlberg
83dc65536f dns request/response tracking did not work if tree==NULL we didnt set up
the tracking structures

this makes dns request/response trackign work when you dont have any 
color filters


svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00