Commit Graph

7306 Commits

Author SHA1 Message Date
Guy Harris ae8b29ec53 More timestamp calculation fixes similar to the previous ones.
svn path=/trunk/; revision=22584
2007-08-22 07:14:08 +00:00
Jaap Keuter 4533ff34a0 From Victor Fajardo:
Updated patches to support draft-ietf-pana-pana-18.txt.

svn path=/trunk/; revision=22583
2007-08-22 06:59:28 +00:00
Guy Harris a18a6233d1 Oops, have to regenerate this after changing its template.
svn path=/trunk/; revision=22582
2007-08-22 04:31:32 +00:00
Jeff Morriss 6dd41716b2 Fix a known- and marked-by-a-comment memory leak: replace g_strdup() with se_strdup(). (The address in question is stored in a conversation structure so it's "seasonal".)
svn path=/trunk/; revision=22579
2007-08-21 22:18:27 +00:00
Richard van der Hoff 62569354fe From yin sun <sunyin51@gmail.com> / bug 1722:
When a subdissector on top of TCP set ... DESEGMENT_UNTIL_FIN ... then
the subdissector should receive the whole reassembled TCP stream in tvb.
But the bug is it is missing the last payload from the FIN packet.


svn path=/trunk/; revision=22578
2007-08-21 22:15:17 +00:00
Richard van der Hoff e6002deb3e From Shaun Jackman <sjackman@gmail.com> / bug 1753:
* asn1/mpeg/packet-mpeg-pes-template.c: Improved decoding of PES
        extension header and Pack header. Decode SCR, PTS, and DTS.
        * asn1/mpeg/mpeg-pes.asn (Pack): Remove.
        * epan/dissectors/packet-mpeg-pes.c: Regenerate.
        * wiretap/mpeg.c (mpeg_read): Decode the SCR using integer
        arithmetic instead of double float arithmetic to prevent rounding
        error.
        * wiretap/wtap-int.h (mpeg_t) <t0>: Use time_t instead of double.


svn path=/trunk/; revision=22577
2007-08-21 22:00:06 +00:00
Richard van der Hoff 32d5537966 From Francois-Xavier Le Bail <fx.lebail@yahoo.com> / bug 1724:
The following patch decode DHCP option 249 (Classless Static Route) used by
some Microsoft systems. Same decoding as option 121 (RFC 3442).


svn path=/trunk/; revision=22576
2007-08-21 21:40:18 +00:00
Luis Ontanon 76658ef0f1 A further iteration in the code, things start to look good!
svn path=/trunk/; revision=22575
2007-08-21 21:32:00 +00:00
Jeff Morriss 7a57f956b8 Change COPY_ADDRESS to SE_COPY_ADDRESS: all of these appear to have "seasonal" scope (e.g., they are used in conversations or similar).
svn path=/trunk/; revision=22573
2007-08-21 21:23:37 +00:00
Jeff Morriss f8e0d53ecf Use SET_ADDRESS (instead of COPY_ADDRESS) for an address that has "ephemeral" scope. Use SE_COPY_ADDRESS when the address is copied to the template cache (with "seasonal" scope.)
svn path=/trunk/; revision=22571
2007-08-21 21:03:59 +00:00
Richard van der Hoff 969bb158f6 From Mike Duigou <wireshark@duigou.org> (bug 1698):
Enclosed is a patch with fixes problems with the desegmentation of chunked HTTP
message bodies.

...

Changing the value of pinfo->desegment_len to DESEGMENT_ONE_MORE_SEGMENT rather
than the current 1 or 2 seems to make everything work. (I'm kind of confused as
to why the headers resassembly code already used DESEGMENT_ONE_MORE_SEGMENT and
the body reassembly code did not).


svn path=/trunk/; revision=22570
2007-08-21 20:57:52 +00:00
Richard van der Hoff 25f64f9d27 fix a signedness-in-comparison warning
svn path=/trunk/; revision=22569
2007-08-21 20:32:22 +00:00
Jeff Morriss caf9f71cee When saving off a temporary copy of an address, use SET_ADDRESS instead of COPY_ADDRESS so as to avoid a memory leak (or adding g_free() calls to fix said memory leak).
svn path=/trunk/; revision=22568
2007-08-21 20:24:17 +00:00
Jaap Keuter 7b593acb18 From Neil Piercy:
This patch set provides a an API for out of band signalling protocols to
register flows as SRTP/SRTCP using extended versions of the existing
rt(c)p_add_address functions. At present the encrypted portions of the payloads
are simply skipped, and the auth tags etc added as fields.

svn path=/trunk/; revision=22562
2007-08-21 07:23:34 +00:00
Jaap Keuter 3d75f7a2a6 Fix the build.
svn path=/trunk/; revision=22561
2007-08-20 21:48:25 +00:00
Anders Broman 76a0564376 Dissect End-to-End and Link-by-Link messages.
svn path=/trunk/; revision=22560
2007-08-20 20:58:02 +00:00
Anders Broman ee86c4c30e From Cyrille Colin:
gsm_a :
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1754
SMS CP (gsm_a_dtap), RP (gsm_a_rp) and T-PDU (gsm_sms) protocol stacks are
decoded in Wireshark when called by BSSAP or RANAP.
Same protocol stack can be called by GPRS-LLC (sapi 7). Simple modification
needed in packet-gsm_a.c to add dtap dissector to llcgprs.sapi 7.

Me a comment in gprs-llc.

svn path=/trunk/; revision=22559
2007-08-20 20:55:06 +00:00
Ronnie Sahlberg 331d267b50 we need to track the fid in the rwdata structure so that reassembly of
connectionoriented dcerpc over smb pipes will be able to find the fid 
used for reassembly


svn path=/trunk/; revision=22557
2007-08-20 08:09:52 +00:00
Luis Ontanon a5efe69a79 Filtering on snmp variables starts to work so I put it there in case anyone wants to start playing with it. I'll leave the generated dissector in place and the rest off the Makefiles so that others are not bothered by this.
TODO:
- Global
   - add libsmi to autoconf (I modified CFLAGS and LDADDs in the makefile.ams appending my own values, that's good only for me)
   - have other users of oid_resolv.h get to use the new functions in oids.h
   - add a menu item or preference setting for the smi_modules UAT ( the smi_modules file has one dquoted string per line with the name of each module to be loaded)
- SNMP
  - put complete information in the labels of the VarBind Items
  - add oids to COL_INFO
  - negative testing (Well, testing in general)
- OIDS
  - implement "ALL" modules 
  - some functions are not yet tested or implemented

I'll put a TO-DO list on the wiki for people (incl. me) to add more items




svn path=/trunk/; revision=22556
2007-08-19 23:00:47 +00:00
Stig Bjørlykke 696bcf8b2d Mark pinfo as unused to make buildbot happy again.
svn path=/trunk/; revision=22555
2007-08-19 21:56:11 +00:00
Anders Broman 782240831c Fix copy-paste errors.
svn path=/trunk/; revision=22554
2007-08-19 20:41:16 +00:00
Anders Broman eafb792669 Disscet CC messages.
svn path=/trunk/; revision=22553
2007-08-19 20:26:08 +00:00
Stig Bjørlykke 10752972ea Check for COTP if Call Request has not been captured.
Fixed an offset for diagnostic in COL_INFO.

This file should really be rewritten to use more proto_tree_add_item's
instead of proto_tree_add_text's.

svn path=/trunk/; revision=22552
2007-08-18 22:56:44 +00:00
Graeme Lunt d36abc4549 Handle unknown Universal and BMP strings.
svn path=/trunk/; revision=22551
2007-08-18 17:39:44 +00:00
Bill Meier c71c4af57c Fix some gcc warnings so buildbots can proceed.
svn path=/trunk/; revision=22548
2007-08-18 03:19:44 +00:00
Luis Ontanon fab09c9575 accept 64bit integers where 8 <= len <= 1
svn path=/trunk/; revision=22546
2007-08-18 00:14:52 +00:00
Gerald Combs 6db456ba1d Fix a couple of signedness mismatches.
svn path=/trunk/; revision=22545
2007-08-17 23:53:41 +00:00
Anders Broman c7fd82dbbe Add code for finding sub dissectors.
svn path=/trunk/; revision=22544
2007-08-17 23:23:36 +00:00
Anders Broman 9f35c24eb5 Add a rudimentarry DPNSS dissector - work in progress.
svn path=/trunk/; revision=22543
2007-08-17 21:31:22 +00:00
Jeff Morriss d47443ba38 Replace a couple more calls to tvb_get_string() with tvb_get_ephemeral_string(). 2 of the 3 replacements fix memory leaks.
svn path=/trunk/; revision=22542
2007-08-17 21:21:50 +00:00
Ashok Narayanan a692269fc9 Added support for 802.1ad and 802.1ah ethernet frames
svn path=/trunk/; revision=22541
2007-08-17 21:21:18 +00:00
Graeme Lunt 98688eb828 Further tidy up for preference.
svn path=/trunk/; revision=22539
2007-08-17 19:40:40 +00:00
Gerald Combs 72daa58e19 Instead of converting between 802.11 frequencies and channels umpteen
different ways, add a set of common conversion routines.  Add a
"Frequency/Channel" column and fill it in where we can.  Fix RSSI column
printing in PPI.

Fix up whitespace along the way.

svn path=/trunk/; revision=22538
2007-08-17 19:34:14 +00:00
Graeme Lunt 3d19c5130b Fix for OSX gremlin in PKCS12 template.
svn path=/trunk/; revision=22537
2007-08-17 19:23:15 +00:00
Graeme Lunt 4d708c7260 Faked BMP string display.
svn path=/trunk/; revision=22536
2007-08-17 19:16:51 +00:00
Graeme Lunt 0e9f4f05f1 Support for the decryption of EncryptedData which is used by PKCS12
Uses the PBE routines from PKCS12.


svn path=/trunk/; revision=22535
2007-08-17 19:14:39 +00:00
Graeme Lunt 54aa46c2bb Support for decrypting of PKCS#12 bag contents.
Supports RC2, RC4 and 3DES with SHA1 Password-based Encryption using libgcrypt functions.
Password is provided as a preference, as is trying to decode with a empty/NULL password. 


svn path=/trunk/; revision=22534
2007-08-17 18:52:40 +00:00
Ulf Lamping 4b215597ae experimental feature: dissector filters
add the possibility, that a dissector writer can provide (usually non-trivial) display filters specific for the protocol in question (with an example in packet-dcerpc-pn-io.c), that will appear in the GUI


svn path=/trunk/; revision=22530
2007-08-16 22:03:10 +00:00
Stig Bjørlykke 1ac635cd7d When calculating checksum for p_mul the checksum field itself is set to zero.
Ensure this field is inside the buffer before altering it, so we don't 
write outside the allocated buffer.

svn path=/trunk/; revision=22529
2007-08-16 20:54:43 +00:00
Anders Broman 8d76d4130e Collect context data.
svn path=/trunk/; revision=22528
2007-08-16 19:59:55 +00:00
Stig Bjørlykke 138d737a47 Added handling of ISO FTAM unstructured binary, as this OID is used in
X.420 FileTransferBodyPart for generic binary bodyparts.
Also added handling of ISO FTAM unstructured text.

svn path=/trunk/; revision=22527
2007-08-16 17:59:27 +00:00
Luis Ontanon b782333f20 - It's just-a-bad-idea(tm) to redefine anything from a foreign library, Don't.
- Allow to look for value-types by name.

[still largelly  untested]

svn path=/trunk/; revision=22524
2007-08-16 06:48:51 +00:00
Ulf Lamping cc8f5e8f60 add an expert info, if ip.ttl < 5
svn path=/trunk/; revision=22521
2007-08-16 04:25:54 +00:00
Stig Bjørlykke 6a751ffd2e Regenerate the CDT dissector with -X and -T options.
svn path=/trunk/; revision=22519
2007-08-15 23:42:29 +00:00
Jeff Morriss ffec5b8896 Convert a couple tvb_get_string()'s into tvb_get_ephemeral_string(). In the one remaining use of tvb_get_string(), g_free the old entry if the pointer is *not* NULL.
svn path=/trunk/; revision=22518
2007-08-15 22:41:49 +00:00
Stig Bjørlykke 93a9ea7879 Improved dumping of unexpected data when dissector for OID not implemented.
svn path=/trunk/; revision=22517
2007-08-15 22:34:56 +00:00
Stig Bjørlykke a29b4bf19e Added support for RFC3030 (BDAT) in SMTP.
Added data fragment length to COL_INFO.
Changed some 0/1 values to boolean.

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

svn path=/trunk/; revision=22516
2007-08-15 22:29:58 +00:00
Jeff Morriss 3dec62b85c - s/ntohs/g_ntohs
- s/ntohl/g_ntohl
- s/free/g_free
- Change some tvb_get_string()+g_free()'s into tvb_get_ephemeral_string()
- Change some tvb_fake_unicode()+g_free()'s into tvb_get_ephemeral_faked_unicode()
- Change some tvb_get_string() calls that were clearly memory leaks (like
  atoi(tvb_get_string(...))) into tvb_get_ephemeral_string()

svn path=/trunk/; revision=22515
2007-08-15 22:27:52 +00:00
Stig Bjørlykke 0cab42b465 Use fragment_start_seq_check to start defragmentation when receiving an
Address PDU without adding a empty message fragment.

svn path=/trunk/; revision=22514
2007-08-15 22:26:00 +00:00
Stig Bjørlykke c6ba6d714d Added fragment_start_seq_check to start a reassembly without adding any data.
svn path=/trunk/; revision=22513
2007-08-15 22:24:05 +00:00