Commit graph

16164 commits

Author SHA1 Message Date
Ronnie Sahlberg
84aad663a5 remove a stack based array and some strcpy()
svn path=/trunk/; revision=16305
2005-10-25 10:24:40 +00:00
Guy Harris
9cc23396f0 Fix a typo.
svn path=/trunk/; revision=16304
2005-10-25 08:58:27 +00:00
Guy Harris
36a2d54f78 Put the code to handle NDS ping replies and NDS replies into routines of
their own.

Do the tapping as early as possible, so it's done even if exceptions are
thrown - and do it regardless of whether the tree argument is null or
not, because a tap might be run without generating protocol trees.

Generate the expert info regardless of whether the tree arugment is null
or not, as that's also used with taps.

svn path=/trunk/; revision=16303
2005-10-25 06:20:46 +00:00
Anders Broman
480e4e949a From Martin André
the attached patch implements a dissector for the Fast Handovers for Mobile IPv6 protocol (RFC4068). This patch was produced against version 0.10.13 and extends the following files:
- packet-icmpv6.c
- packet-ipv6.h
- packet-mip6.c
- packet-mip6.h

svn path=/trunk/; revision=16302
2005-10-25 06:00:53 +00:00
Anders Broman
8f11a0d7c6 From Jochen Friedrich
this patch adds the description for LLC SAP 0xB4 and adds a dissector for basic format XID frames as documented in IEEE802.2. These frames are independent on the SAP / protocol and mandatory to all implementations.

svn path=/trunk/; revision=16301
2005-10-25 05:56:21 +00:00
Anders Broman
11c13762b7 Add missing file ( packet-ftbp.ch)
svn path=/trunk/; revision=16300
2005-10-25 05:53:12 +00:00
Anders Broman
54f93dda11 From Jaap Keuter:
Ethereal 0.10.13 and trunk have a glitch in the NSIS Makefile.nmake. It still works with WinPcap_3_1_beta4.exe. The attached patch resolves this.


svn path=/trunk/; revision=16299
2005-10-25 05:52:20 +00:00
Guy Harris
f3144c4fef Clean up "print_address()" - fix the indentation, do the check for a
too-large address in common code, and *don't* use tvb_get_letohl() to
get IPv4 addresses (just use proto_tree_add_item(), it works Just Fine).

For integral values, always do the tvb_ensure_bytes_exist() test; don't
just do it if the length is the expected value (the real problem is with
bogus too-large lengths, so it's more important to do the check if the
length *isn't* the expected value!).  Fixes bug 549.

svn path=/trunk/; revision=16298
2005-10-25 00:28:40 +00:00
Luis Ontanon
74d1997f40 forgot this from the last commit
svn path=/trunk/; revision=16297
2005-10-24 21:52:14 +00:00
Anders Broman
314c36da9a From Graeme Lunt:
The ftbp.patch file includes:
a) A fix to acse.cnf which works around an asn2eth bug (it is the AE-qualifier EXPORT I want, but asn2eth doesn't generate the appropriate extern for the values). Also a small cosmetic change for EXTERNAL decodings.
b) New EXPORTs for the FTAM dissector for use in FTBP.
c) A fix to asn2eth to solve the problem if you EXPORT types that include a '-' character in the name (e.g. "AE-qualifier" from acse.cnf, "Date-and-Time-Attribute" from ftam.cnf). The problem is that asn2eth generates the "xxxx-exp.cnf" file using the 'C' name (which has replaced '-' with '_') rather than the original 'ASN' name. The fix just undoes the replacement as I couldn't see the original name being preserved anywhere. There still remains a problem if the type has a '.' in the name - but generally I don't think they do.

* Better ROS handling and registration
* Simplified RTSE registration
* X411 column information, extension naming and use of new RTSE/ROS registration
* X420 notification extensions, warnings removal and export of ExtensionsField (missed from recent FTBP patch).
* Better highlighting of S4406 protocol.


svn path=/trunk/; revision=16296
2005-10-24 21:42:19 +00:00
Luis Ontanon
149b419740 - optionally decode data pdus
- optionally decode a 2 byte pseudo-header
- Beautify colinfo


svn path=/trunk/; revision=16295
2005-10-24 21:26:25 +00:00
Luis Ontanon
9008cf5cd9 - packet records with AAL5 Pdus or AAL2 Sdus contain VP/VC and CID info in the packet record, use that instead of the one in the intreface description record.
- Fix Timestamps that got broken with nanoseconds.
- Add some more disabled code for debugging.


svn path=/trunk/; revision=16294
2005-10-24 21:20:03 +00:00
Anders Broman
c38e1002dd UMTS Node B Application Part(NBAP) packet dissection(3GPP TS 25.433 version 6.6.0 Release 6)
All IE:s not dissected yet.

svn path=/trunk/; revision=16293
2005-10-24 21:16:44 +00:00
Ronnie Sahlberg
b949ed06b1 get rid of a few strcpy and an array from the stack
svn path=/trunk/; revision=16292
2005-10-24 08:44:36 +00:00
Guy Harris
cd7fae828c Add #defines for NDS tag values, and use them in the definition of
nds_tags[] and in switch statements.  (Also, catch a case where we
didn't use NDS_PTYPE_ values.)

Use the existing #defines for MVTYPE_ values.

Make the handling of NDS_PTYPE_{IP,UDP,TCP} in one case match the
handling of the other cases (don't advance "ioffset", as it's advanced
by the length of the item).

When checking whether an NDS reply has a completion code, don't check
the fragment size, check the reassembled packet size.

Fix the handling of referrals in one case.

svn path=/trunk/; revision=16291
2005-10-24 02:49:32 +00:00
Guy Harris
eb2fb526aa Don't get caught in an infinite loop if we're stuck at the end of the
captured data.  Fixes bug 548.  (Also note that we need a better general
solution.)

svn path=/trunk/; revision=16290
2005-10-24 02:35:43 +00:00
Guy Harris
c7e56ef089 Clean up indentation.
Hand NCP_ALLOCATE_SLOT and NCP_DEALLOCATE_SLOT packets to
"dissect_ncp_request()", so we match up requests and replies, fill in
the Info column properly, etc..

svn path=/trunk/; revision=16289
2005-10-24 02:05:19 +00:00
Guy Harris
8e35fd8078 Add #defines of NDS protocol types, and use them in the value_string and
switch statements.

Add some sanity checking for ptvcursor_advance calls.

proto_tree_add_item() works fine for IPv4 addresses; use it for them. 
(tvb_get_letohl() doesn't work fine for them, even though it appears to
do so on little-endian machines.)

Only set the "visible" flag on the protocol tree when we're sure we have
one, so that it gets set even if we create a temporary tree.

Catch exceptions when dissecting requests, and compute and save the
results of conditional tests before rethrowing the exception, so the
results get saved even if the dissection gets an exception.

svn path=/trunk/; revision=16288
2005-10-22 06:25:14 +00:00
Guy Harris
c72ffd259d Move the ptvcursor.c code to epan/proto, and make ptvcursor_add() handle
FT_UINT_BYTES and FT_UINT_STRING correctly when the tree argument is
null (which involves carving proto_tree_add_item() into bits and having
both ptvcursor_add() and proto_tree_add_item() call those bits).

svn path=/trunk/; revision=16287
2005-10-22 05:43:09 +00:00
Guy Harris
e857b4feb4 Use the somewhat-misnamed "ipv4_addr_and_mask()" and
"ipv6_addr_and_mask()" to handle address+prefix bit length combinations.

svn path=/trunk/; revision=16286
2005-10-22 05:27:48 +00:00
Guy Harris
67d94f37a4 Update URL for Sniffer manual, and expand a comment a bit.
svn path=/trunk/; revision=16285
2005-10-22 04:09:37 +00:00
Guy Harris
a24b71271a Don't roll your own code for showing the usual display of bits in a
bitfield, use the code we already have.

svn path=/trunk/; revision=16284
2005-10-22 03:52:06 +00:00
Guy Harris
097f75dd7a Add #defines for the DOS Sniffer network types and for various frame
status field bits".

Check for "Internetwork analyzer" captures by checking the Sniffer
network type, and save that type rather than just an "ATM or not" flag
in the private data.

svn path=/trunk/; revision=16283
2005-10-22 03:49:23 +00:00
Ulf Lamping
ede79e4d3c Win32: first steps towards using GTK2.6, add zipfile and dir name definitions
svn path=/trunk/; revision=16282
2005-10-21 18:47:04 +00:00
Gilbert Ramirez
0b3c9ad5ce Revert 16279.
svn path=/trunk/; revision=16281
2005-10-21 13:11:04 +00:00
Anders Broman
9dd9e3e80f From Julian Onions
- some improvements to the NORM decoder, and the ability to
(optionally) heuristically detect NORM.
- some improvements to FEC block labelling.
- making the LCT header extension handler more generic and to decode more header extensions.

svn path=/trunk/; revision=16280
2005-10-20 18:51:47 +00:00
Gilbert Ramirez
385fb3eea2 From Greg Morris.
Expert data must perform a re-dissection to trigger the NCP dissector.
Change the call cf_retap_packets() to cf_redissect_packets().

svn path=/trunk/; revision=16279
2005-10-20 18:07:03 +00:00
Gilbert Ramirez
c5db51da2d From Greg Morris, patch to allow proper search/filtering of
NCP conversations.

svn path=/trunk/; revision=16278
2005-10-20 18:04:11 +00:00
Anders Broman
591826a821 From Bruno Deniaud:
Handle NEMO (RFC  3963).

svn path=/trunk/; revision=16277
2005-10-20 15:51:39 +00:00
Anders Broman
20381722de Use the right offset when calling packet-gsm_a.c functions.
svn path=/trunk/; revision=16276
2005-10-20 15:49:03 +00:00
Anders Broman
604d8a8026 From Stephen Donovan:
Allow Ethereal to decode the IP address inside of Option 118

svn path=/trunk/; revision=16275
2005-10-20 05:29:53 +00:00
Guy Harris
e407c69770 Put back some comments that got removed and that note issues seen with
some captures.

svn path=/trunk/; revision=16274
2005-10-20 02:45:52 +00:00
Ulf Lamping
c522a2611c from Jaap Keuter:
Working with the reassembly functionality Ethereal provides I've found
some additional changes had to be made to the EDG 8.4.1:
- a typo (made by myself)
- fragment_add_seq_check() doesn't take -1 as length remaining
- process_reassembled_data() can be called with or without tree, and
  is required in both dissection runs
- some whitespace stuff

svn path=/trunk/; revision=16273
2005-10-19 21:08:34 +00:00
Guy Harris
f225f8819e At least on Tiger, multiple definitions of an external don't work.
svn path=/trunk/; revision=16272
2005-10-19 19:40:55 +00:00
Gerald Combs
4665dd1714 Ethereal doesn't like it when you try to tell it that integers are
either -1 or 0 bytes long.  Use proto_tree_add_text() instead of
proto_tree_add_uint_format().  Fixes bug 542.

svn path=/trunk/; revision=16270
2005-10-19 15:36:59 +00:00
Gilbert Ramirez
05bdac4d3a From Greg Morris.
Adds NCP data to conversations and SRT.

svn path=/trunk/; revision=16269
2005-10-19 14:45:24 +00:00
Gilbert Ramirez
804c13c213 From Greg Morris:
Updates to the NMAS dissector.
 
1. Fixes error checking fragments
2. Adds expert data


svn path=/trunk/; revision=16268
2005-10-19 14:39:09 +00:00
Gilbert Ramirez
c31e002512 From Greg Morris:
Adds expert data to the NDPS dissector


svn path=/trunk/; revision=16267
2005-10-19 14:32:05 +00:00
Gilbert Ramirez
ab3f0deefc From Greg Morris:
makefile.common.diff - epan directory
1. Adds new packet-ncp-sss.c and packet-ncp-sss.h for new Secret Store dissector
 
New Novell Secret Store Services dissector
packet-ncp-sss.c
packet-ncp-sss.h
 
ncp2222.py.diff
1. Adds a number of return values
2. Adds 64bit file size support
3. Add NCP 89,xx NCP's for UTF8 support
4. Fixes a number of field values for proper dissection
5. Adds support for Secret Store dissector
 
packet-ncp2222.inc.diff
1. Skwelches some compiler warnings
2. Redo of fix for bug 535 which original fix broke dissection of NDS verb 5
3. Adds support for Secret Store dissector
4. Adds expert data
5. Adds tap for service response time
6. Fixes dissection of stream attribute
7. Fixes defragmentation problem with more then 10 fragments
8. Fixes NDS dissection if reply buffer was less then 7
 
packet-ncp.c.diff
1. Adds tap data
2. Adds expert data
3. Fixes calculation for NCP connection number
4. Fixes malformed packet for destroy service connection
 
packet-ncp.c.diff
1. Adds tap data


svn path=/trunk/; revision=16266
2005-10-19 14:28:26 +00:00
Guy Harris
364702618a Point specifically to the CDP information on the various Cisco pages.
svn path=/trunk/; revision=16265
2005-10-19 07:57:38 +00:00
Jörg Mayer
71df36b814 Update from samba tree
svn path=/trunk/; revision=16264
2005-10-18 14:59:30 +00:00
Gerald Combs
f4eaf40648 Don't pass a null value to strcmp(). Fixes bug 540.
svn path=/trunk/; revision=16262
2005-10-18 13:36:32 +00:00
Guy Harris
39fb4b8378 "aalt5_len" in the ATM pseudo-header is not guaranteed to be set to a
non-zero value - it's only set from file formats that provide it in a
per-packet header, and only the old DOS Sniffer did so, so it's zero for
all other capture types.  Instead, check the actual packet data length.

Also check it against 16; 14 bytes isn't large enough for a LANE
Ethernet frame.

svn path=/trunk/; revision=16261
2005-10-18 10:39:23 +00:00
Guy Harris
6e759b47f2 .FN_BODY text gets printf-style expansion done on it, so format strings
in the code have to have %'s escaped.  Do so.

svn path=/trunk/; revision=16260
2005-10-18 00:07:49 +00:00
Gerald Combs
7f33a96ea9 Don't pass -1 as a fragment length to fragment_add_check(). This keeps
us from crashing and it keeps Valgrind from taunting us with

==29091== Warning: silly arg (-1) to malloc()

Fixes bug 537.

svn path=/trunk/; revision=16258
2005-10-17 20:05:18 +00:00
Ulf Lamping
fab07a94e0 don't show the "stopping currently running capture" dialog, as the packet list seems to have problems updating the screen, so some ugly artefacts remain on the screen.
after I've fixed a bug in the Win32 capture stop mechanism some days(?) before (which speeds up that stopping a lot), this dialog isn't really needed

svn path=/trunk/; revision=16257
2005-10-17 19:46:29 +00:00
Gerald Combs
93b99abf30 In packet-dcerpc-nt.c, make sure we call init_pol_hash() each time we load
a capture file.  This should fix bug #536.

Make sure we initialize our hash tables in packet-dcerpc-nt.c and several 
other files.  Fix up whitespace while we're at it.

svn path=/trunk/; revision=16255
2005-10-17 18:56:27 +00:00
Anders Broman
e8065e3fde From Peter Johansson
Correct a typo.

svn path=/trunk/; revision=16254
2005-10-17 18:20:25 +00:00
Gerald Combs
5cadbb4de4 When dissecting an ACSE APDU make sure our OID isn't for an ACSE APDU
(which would make us recurse until we crashed).

svn path=/trunk/; revision=16252
2005-10-17 16:12:24 +00:00
Luis Ontanon
e3285cbcae make sure ta is signed before operating
svn path=/trunk/; revision=16251
2005-10-16 21:16:30 +00:00