Commit Graph

2860 Commits

Author SHA1 Message Date
Ulf Lamping 3f3aae1681 minor code cleanup
svn path=/trunk/; revision=17093
2006-01-24 19:03:09 +00:00
Jaap Keuter 1fb3bc7c86 Derived some more assumptions from NLB traffic
svn path=/trunk/; revision=17091
2006-01-24 11:54:27 +00:00
Luis Ontanon 1ff8c4272f Add register_postdissector() to the API.
Dissectors registered with register_postdissector() will be called after all other dissectors have been called.

Use it to register mate.


svn path=/trunk/; revision=17089
2006-01-24 00:26:57 +00:00
Guy Harris 878a077605 Add some more sanity checking of the Radiotap header.
svn path=/trunk/; revision=17085
2006-01-23 23:21:02 +00:00
Anders Broman d31de2bdb4 Bugfix: network address not dissected correctly
svn path=/trunk/; revision=17084
2006-01-23 22:13:08 +00:00
Guy Harris 41c941b49c Call capture_radiotap() when capturing on a device supplying Radiotap
headers.

Fix capture_radiotap() to check for padding between the 802.11 header
and the 802.11 payload and to call different capture routines depending
on whether it's present or not, and create capture_ieee80211_datapad()
to handle the case where it's present.

Fix capture_radiotap() to convert the Radiotap header length from
little-endian, and to do some sanity checking of that length.

Fix capture_ieee80211_common() to use the offset supplied to it to fetch
the frame control field, as that offset isn't necessarily 0.

svn path=/trunk/; revision=17083
2006-01-23 16:56:34 +00:00
Guy Harris 2ab3f01671 Rename all the COOK_ macros to indicate the field from which they're
extracting data (except for the association ID field, where adding
ASSOC_ID would be redundant).

svn path=/trunk/; revision=17081
2006-01-23 10:17:07 +00:00
Guy Harris d269468356 From Sam Leffler:
1. Fix a bug in caclulating the 802.11 header length for QoS
	   data frames (way bad regression from previous code). 

	2. Add support for packets w/ data padding between the 802.11
	   header and the payload (as indicated in the radiotap flags).

	3. Add support for handling FCS indication in the radiotap
	   flags. 

	4. Fix display of TSF (previous code was not byte swapping).

	5. Update ieee80211_mhz2ieee in radiotap.c to handle more
	   channels. 

	6. Nuke some #if 0 code I left in radiotap.c a while back.

Also, clean up the various macros that extract stuff from 802.11 header
fields or define bitfields within those header fields:

	group them by the fields from which they extract and the values
	they extract, or the header fields to which they belong;

	get rid of some of the COOK_ in the names - COOK_ really doesn't
	indicate anything useful, such as the field from which they're
	extracting (we should get rid of the rest);

	put in some more comments explaining what they do;

	get rid of some unused macros;

	get rid of some values that aren't flag values - they're values
	to test whether something's a data frame with a particular byte
	set in the subtype field, but they're only used on data frames,
	so we only need to test the bit in question, so we define macros
	to test the bit and name them to indicate that they're for use
	on data frames.

Consistently use "CF-Ack" and "CF-Poll" in the strings for various data
frame type/subtype values, and get rid of "802.11" (it should be obvious
to one and all that this is 802.11...).

Comment out some variables used only in commented-out code.

Get rid of some unused variables.

Fix up one "proto_tree_add_text()" call where the format string didn't
match the arguments.

svn path=/trunk/; revision=17080
2006-01-23 09:20:06 +00:00
Jaap Keuter 287e228fc5 Implemention of T38 TCP defragmentation by Alejandro Vaquero
svn path=/trunk/; revision=17079
2006-01-23 07:12:26 +00:00
Anders Broman be6277f8c8 From Marc Petit-Huguenin:
This patch for the STUN dissector fixes a bug (wrong value for DATA_INDICATION attribute) and adds the decoding of IPv6 address in attributes.


svn path=/trunk/; revision=17078
2006-01-23 06:14:31 +00:00
Guy Harris f371ed6d3d Get rid of unused variables, fix indentation, don't assign NULL to
non-pointer variables.

svn path=/trunk/; revision=17077
2006-01-22 23:14:58 +00:00
Guy Harris 6967e5bef7 "size_t" can be "unsigned int" or "unsigned long", so cast it to
"unsigned long" and print it with %lu.

svn path=/trunk/; revision=17076
2006-01-22 23:08:15 +00:00
Anders Broman 1c5874e2e3 Dissect CellGlobalIdOrServiceAreaIdOrLAI and RAIdentity
svn path=/trunk/; revision=17075
2006-01-22 21:16:33 +00:00
Ulf Lamping c73ed3c6d5 add Win32 Structured Exception Handling (SEH) at the same place we're already doing the Portable Exception Handling.
This way we (hopefully) can continue dissecting with the next packet, even if a more serious exception had occured, e.g. a memory access violation or a divide by zero exception.

Obviously, not all problems solved, as SEH won't protect us from other problems, e.g. endless loops and such

svn path=/trunk/; revision=17070
2006-01-22 02:22:14 +00:00
Anders Broman fded8deafc RANAP - Dissect ProtocolExtensionField IE:s
GSM A - Service Request; Mobile identity element is LV type

svn path=/trunk/; revision=17069
2006-01-21 19:12:52 +00:00
Ulf Lamping 864edeb5ac add matched coloring rule name and string to the frame dissector output (or nothing if no coloring rule matched or none was set)
svn path=/trunk/; revision=17068
2006-01-21 17:49:00 +00:00
Jörg Mayer a052b3a98b packet-bgp.c: Fix incorrect use of g_snprintf return value
mp_addr_to_str was unnecessary 'complex' - simplified it
packet-dns.c: Fix incorrect use of g_snprintf return value
packet-dcm.c: Fix incorrect use of g_snprintf return value
        Someone who understands the protocol should look at the
        "vr, tr might be used uninitialized..." warning.
packet-x11.c: Fix incorrect use of g_snprintf return value
packet-kerberos.c: Fix incorrect use of g_snprintf return value
        Someone should take a look at the
        "longjump might clobber ..." messages
packet-diameter.c: Fix incorrect use of g_snprintf return value
        Get rid of unsigned < 0 check
packet-pgm.c: Fix incorrect use of g_snprintf return value
packet-nbns.c: Fix incorrect use of g_snprintf return value
packet-winsrepl.c: Collateral damage to packet-nbns.c fix
packet-netbios.c: Collateral damage to packet-nbns.c fix
packet-netbios.h: Collateral damage to packet-nbns.c fix
packet-kerberos.c: Collateral damage to packet-nbns.c fix
packet-nbipx.c: Collateral damage to packet-nbns.c fix


svn path=/trunk/; revision=17065
2006-01-20 21:18:18 +00:00
Anders Broman f194c9eddb Dissect:
- PDPcontext
 - GSN-Address
 - QoS

svn path=/trunk/; revision=17063
2006-01-20 19:41:31 +00:00
Anders Broman f2bc8ad4a8 Handle sgmented XUDT:s
svn path=/trunk/; revision=17060
2006-01-20 19:32:59 +00:00
Jörg Mayer 256225d73f Mike Hall:
This will add the ability to configure a .1q vlan column in ethereal.

Me:
Change 1q -> 1Q

svn path=/trunk/; revision=17058
2006-01-20 08:48:43 +00:00
Gerald Combs b3d0b97635 Make sure we don't use the ADNS version of inet_aton; it's broken.
This fixes bug 523, but exposes more of bug 658.

The TACACS and SDP dissectors don't call inet_aton(), so don't include it.

svn path=/trunk/; revision=17056
2006-01-19 23:01:24 +00:00
Anders Broman 9d6de675a4 ext_qos_subscribed was not correctly decoded in Camel and GSM MAP
Change to use proto_add_item in packet-gsm_a.c for some octets and export value strings.

svn path=/trunk/; revision=17055
2006-01-19 18:20:14 +00:00
Anders Broman 28e69752b2 Dont dissect XDT data in case of Segmentation as that will give [Malformed packet] and the Segmentation IE will n ot be dissecterd.
svn path=/trunk/; revision=17054
2006-01-19 05:51:59 +00:00
Ulf Lamping 67e90082a7 add "RPC_E_TIMEOUT" to the reject status codes
svn path=/trunk/; revision=17053
2006-01-19 02:00:28 +00:00
Jaap Keuter ac3e6ed312 Add option presentation, solving bug 697
svn path=/trunk/; revision=17052
2006-01-18 21:41:34 +00:00
Gerald Combs f816511ea9 In packet-cops.c use proto_item_append_text() instead of creating a
separate buffer.  Fixes the current Buildbot failure.

Don't let the sprint_realloc_* functions reallocate ep_allocated memory.
Add comments warning against this in the future.

In emem.c, make sure we don't use an extra 100k every stinkin' time
someone wants to allocate memory when debugging is enabled.

Fixup whitespace.

svn path=/trunk/; revision=17051
2006-01-18 20:02:19 +00:00
Anders Broman 4ecd261cfb Change some OPCODE decodes from respons to Invoke (bug fix), let gsm_a decode som IE:s.
svn path=/trunk/; revision=17050
2006-01-17 21:52:30 +00:00
Anders Broman dbf15d9e0b Add ethertypes and value_str for IEC 61850
svn path=/trunk/; revision=17049
2006-01-17 21:50:43 +00:00
Jörg Mayer 467de087cc According to 802.11e D11, 7.3.2.13, station count is a 16 bit value.
Accoding to 802.11, 7.1.1, numbers are little endian.

svn path=/trunk/; revision=17047
2006-01-17 13:13:29 +00:00
Jörg Mayer f905ad1862 packet-fcswils.c: Fix incorrect use of g_snprintf return
packet-wccp.c: Fix incorrect use of g_snprintf return
packet-cops.c: Fix incorrect use of g_snprintf return value
packet-wtp.c: Fix incorrect use of g_snprintf return value


svn path=/trunk/; revision=17046
2006-01-17 10:56:06 +00:00
Jörg Mayer be27196e0a - Replace snprintf by g_snprintf
- Beginning of incorrect g_snprintf retval ussage fixes
- Make qbss station count a byte again until we know
  whether the count is a 2 byte le value instead

svn path=/trunk/; revision=17045
2006-01-17 10:54:23 +00:00
Jaap Keuter d0c1a48a34 Fix typo, solving bug 693
svn path=/trunk/; revision=17044
2006-01-17 06:39:57 +00:00
Ulf Lamping c59c716e7a MSVC compiler warnings:
packet-ldap.c(784) : warning C4101: 'seq_len' : unreferenced local variable
packet-ldap.c(782) : warning C4101: 'length' : unreferenced local variable
packet-ldap.c(785) : warning C4101: 'header_bytes' : unreferenced local variable

svn path=/trunk/; revision=17041
2006-01-17 00:01:22 +00:00
Jörg Mayer 1900bf87fc done:
packet-ntp.c: Rather confused and incorrect use of g_snprintf return value
packet-pim.c: whitespace change
packet-icmpv6.c: g_snprintf takes trailing \0 into account, fix off by 1 error
packet-clnp.c: Fix incorrect use of g_snprintf return value
packet-isakmp.c: g_snprintf takes trailing \0 into account
packet-tr.c: Fix incorrect use of g_snprintf return value
packet-radius.c: Fix incorrect use of g_snprintf return value
packet-radius.h: constify a string variable
packet-ldap.c: The return value isn't needed, so don't use it incorrectly
packet-tcp.c: Fix incorrect use of g_snprintf return value
packet-windows-common.c: Remove unneeded DISSECTOR_ASSERT
packet-smb-sidsnooping.c: g_snprintf takes trailing \0 into account
packet-pvfs2.c: g_snprintf takes trailing \0 into account
packet-ptp.c: Remove #include snprintf
packet-ppp.c: Fix incorrect use of g_snprintf return value
packet-ospf.c: Fix incorrect use of g_snprintf return value
packet-mip6.c: snprintf -> g_snprintf
packet-bootp.c: Remove a commented out bad use of g_snprintf
packet-ber.c: snprintf -> g_snprintf, g_snprintf takes trailing \0 into account

2do:

     52 packet-ieee80211.c: 2DO
      2 packet-nfs.c: 2DO - too many side effects
     33 packet-bgp.c: 2DO
     18 packet-dns.c: 2DO
     14 packet-dcm.c: 2DO
     13 packet-x11.c: 2DO
     11 packet-kerberos.c: 2DO
     10 packet-diameter.c: 2DO
      9 packet-snmp.c: 2DO
      9 packet-pgm.c: 2DO
      7 packet-nbns.c: 2DO
      6 packet-fcswils.c: 2DO
      5 packet-wccp.c: 2DO
      5 packet-cops.c: 2DO
      4 packet-wtp.c: 2DO


svn path=/trunk/; revision=17038
2006-01-16 07:59:44 +00:00
Anders Broman c5e0d27e84 From Alejandro Vaquero:
patch to add t38 setup info for h245 packets.

- Me add /y to makefiles.

svn path=/trunk/; revision=17036
2006-01-16 06:05:25 +00:00
Jaap Keuter 815a4af69e Hi All,
Find attached a couple of changes for t38:
- Use the dissector to reassemble t30 frames
- Dissect t30 protocol
- Move the "Fax t38 analysis" to the "VoIP Calls". Now when selecting
"Statistics"->"Fax t38 analysis" option, there is a message that
redirect the user to use the "Voip calls" instead. We may keep this
option for one release, and then remove it ?
- Added in the "Voip calls" the ability to detect a t38 call if there
are not signaling associated with it. For example, when using "Decode
as.." to dissect t38 packets, it is possible to use the "Voip calls" to                                                      analyze that call.
- Display "SDP (t38)" in the "Voip calls graph" for SDP t38 sessions.

Regards
Alejandro Vaquero


svn path=/trunk/; revision=17033
2006-01-15 15:01:14 +00:00
Ulf Lamping d0dd39b277 add COTP to fragment COL_INFO message, so the user knows where the fragment is coming from
svn path=/trunk/; revision=17032
2006-01-15 13:51:58 +00:00
Jörg Mayer 122671b36c Jaap Keuter:
I'm not too fond of using pointer arithmetic in such cases. How about
this:


svn path=/trunk/; revision=17031
2006-01-14 23:09:44 +00:00
Jörg Mayer 0bfcf705cd We may not work with the length returned by g_snprintf, as this is
the number of bytes that would have been used if the buffer was long
enough.
Fixes http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=686

svn path=/trunk/; revision=17030
2006-01-14 11:29:24 +00:00
Anders Broman 6c822ae0e6 MTP3 standard in SCCP MTP3 and M3UA will be determined by Preference setting in MTP3.
svn path=/trunk/; revision=17029
2006-01-14 09:52:04 +00:00
Jörg Mayer 59bccbee5e - Change Cisco QBSS V2 to be part of the Aironet IE dissection.
- Change proto_tree_add_uint ( ...., tvb_get_guint8(...)) to
  proto_tree_add_item ( ....) for all qbss dissection code
- Change all qbss occurrences scount to be 16 bits (I may have
  gotten endianess wrong! Testers / sample captures needed)
- Change wlan_mgt.tag.aironet... filter to wlan_mgt.aironet...

svn path=/trunk/; revision=17028
2006-01-13 18:30:12 +00:00
Jaap Keuter 343b357b0e From Patrik Olsson
Attached is a patch that fixes several decoding problem is the gsm_a
dissector. The bugs are also submitted to bugzilla id #684 and #687.

svn path=/trunk/; revision=17027
2006-01-13 15:17:50 +00:00
Jörg Mayer 96576bbb3e Add code to verify the shared secret for documentation purposes.
#if 0 that code.


svn path=/trunk/; revision=17026
2006-01-13 04:35:10 +00:00
Jaap Keuter 6e80585275 Add warning when UDP length field is too large.
Patch by Graeme Hewson

svn path=/trunk/; revision=17023
2006-01-12 22:16:20 +00:00
Gerald Combs 62a3709da3 Reset h245_pi using CLEANUP_PUSH/CLEANUP_CALL_AND_POP so that we don't leave
ep_alloc()ated memory lying around.  Fixes bug 667.

Fixup whitespace.

svn path=/trunk/; revision=17022
2006-01-12 21:53:02 +00:00
Jaap Keuter 055d695edc Fixes bug 679.
The offset wasn't passed to the PDU dissector so it always started dissection
from the start of the TVB.

svn path=/trunk/; revision=17020
2006-01-12 16:17:07 +00:00
Anders Broman 3096dc2686 FromHannes Gredler
-rework the GGSN dissector to proper parse meta extensions -more graceful magic-number detection - for better (JUNOS 6.4)
   downwards compatability
-correct calculate the offset to ATM cookies when there
   are meta-extensions present

svn path=/trunk/; revision=17016
2006-01-12 06:09:48 +00:00
Gerald Combs faef737b31 Before we begin dissection, NULLify some global variables that might
contain ep_alloc()ed data from a previous dissection.  Correctly fixes
bug 651 (the previous fix was incorrect).

svn path=/trunk/; revision=17015
2006-01-12 02:06:34 +00:00
Jaap Keuter 356cbd3a5a From Thomas Sillaber
here is the Patch for:
    - AVA (Alcatel Automatic VLAN Assignment)
    - QBSS ( QOS Basic Service Set)

svn path=/trunk/; revision=17008
2006-01-11 22:05:43 +00:00
Jörg Mayer 3245c72141 set: The first 4 bytes seem to be the salt
svn path=/trunk/; revision=17003
2006-01-11 18:43:17 +00:00