Commit graph

3777 commits

Author SHA1 Message Date
Jaap Keuter
6f7f25b8d5 From Donald White:
First, the length of the header of a sub-frame may be miscalculated if
if the PID field is not present, but was present in a previous
sub-frame.  The calculation of the header length will use the value from
the previous sub-frame.

Second, correct the typo "ength" to "length".

Third, the length of the current sub-frame was not passed as the
reported length to a sub-dissector.  When the sub-dissector calls
tvb_reported_length(), the function returns the length of the complete
frame and not the length of the sub-frame to be dissected.

svn path=/trunk/; revision=19132
2006-09-04 14:12:26 +00:00
Martin Mathieson
76192b1c6c Partial implementation of UMTS FP. Currently only works with Catapult DCT2000 format files, as need extra information about packet when decoding. There are a few TODOs (notably E-DCH channels), but the current version gives OK coverage.
svn path=/trunk/; revision=19130
2006-09-04 11:04:14 +00:00
Ronnie Sahlberg
6e040b3a83 krb4 is a new style dissector and is called through a handle from krb5 which is also new style.
use call_dissector_only()  which is new-style aware and not call_dissector() which is not.

this fixes a recent bug found on the heimdal list.



svn path=/trunk/; revision=19129
2006-09-04 08:18:52 +00:00
Ronnie Sahlberg
389e7390e9 make the heuristics for detecting kerberos4 stronger
svn path=/trunk/; revision=19128
2006-09-04 07:44:30 +00:00
Ronnie Sahlberg
c91f8d9876 From David Buechi
New protocol: epl v1


Hi,

in addition to the recently submitted dissector for the EPL v2 protocol,
this is the dissector for the first version of the EPL protocol.

Best Regards,
David




svn path=/trunk/; revision=19125
2006-09-02 23:18:38 +00:00
Ronnie Sahlberg
e3c9fab51c add primitive reassembly of gssapi
this will allow reassembly of gssapi blobs that span multiple smb/sessionsetup command pdus



svn path=/trunk/; revision=19119
2006-09-02 11:46:15 +00:00
Guy Harris
f1706bc27a Add a common routine for adding session IDs. Have it handle session IDs
from 1 to 8 bytes, and not only handle 0-byte session IDs as special,
have it handle session IDs > 8 bytes as special as well.

svn path=/trunk/; revision=19115
2006-09-02 06:38:21 +00:00
Guy Harris
d6209d8dbe Add brackets to squelch a compiler warning.
Fix indentation.

svn path=/trunk/; revision=19114
2006-09-02 06:36:42 +00:00
Ronnie Sahlberg
8e830b8ef4 break out the handling of conversation specific data so that we will always have one such struct (and not an value pointer to an oid struct)
so that it is easier to attach other useage to the conversation specific state



svn path=/trunk/; revision=19113
2006-09-02 02:03:26 +00:00
Ronnie Sahlberg
62780fec5a resolve the oid to a variable before we check it in the conditional so that
we can add code to check that it looks sane (for better heuristics) when
we start adding GSS-KRB reassembly.

we need this for some transports such as SMB/SessionSetup that will transport GSS-KRB blobs inside multiple PDUs (multiple different SMB/SessionSetups) so we can reassemble the blobs before decoding them.


this probably only happens for SMB/SessionSetup   but the design of that command is so "nice" that you can not tell whether the blob is fragmented or not or how big it is supposed to be by looking at the SMB layer itself, one needs to know the BER length field for the BER APPLICATION tag. :-(

to make things worse, the only way match multiple such fragments together one will need not just the fragments from the SessionSetup requests  but also the UID that is returned in the response to the initial request.
perverse design.


lets assume that there will almost never be multiple sessionsetups on the same tcp session in real traces    so to make things easier just ignore the UID for now when reassembling. (well reassembly is not added yet but will be)




svn path=/trunk/; revision=19112
2006-09-02 00:43:19 +00:00
Ronnie Sahlberg
000182e09b remove a comment with dead code
remove three pointless volatile declarations


svn path=/trunk/; revision=19111
2006-09-02 00:24:31 +00:00
Ronnie Sahlberg
4c5987ce98 always create a conversation for gssapi
we will need a conversation in more places once we start adding reassembly of gss-krb blobs that span multiple pdus (smb/sessionsetup)



svn path=/trunk/; revision=19110
2006-09-02 00:17:35 +00:00
Anders Broman
8faa5f837c From Florent Drouin:
patch to implement the decoding of the GPRS reference. The specific oid for the CAP-GPRS-ReferenceNumber is attached to a decoding function in the camel module.

svn path=/trunk/; revision=19108
2006-09-01 16:17:48 +00:00
Ulf Lamping
a0dbf3d7ac mark the "short segment" message field as generated and add an expert_info to it
svn path=/trunk/; revision=19106
2006-08-31 23:00:44 +00:00
Ulf Lamping
04f35c220a use an expert_info instead of an fprintf to show an undecoded message (fprintf won't work on windows as usually no console available)
svn path=/trunk/; revision=19105
2006-08-31 22:58:22 +00:00
Jörg Mayer
b1719dd68f Albert Chin:
Fix http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1078


svn path=/trunk/; revision=19103
2006-08-31 13:14:48 +00:00
Tomas Kukosa
c5374442cf flags have only 1 byte
svn path=/trunk/; revision=19086
2006-08-30 10:03:50 +00:00
Tomas Kukosa
eb86b80cf4 display Random as a single item with two subitems
svn path=/trunk/; revision=19084
2006-08-30 07:31:36 +00:00
Anders Broman
f558e1491e Remove debugcode left by mistake...
svn path=/trunk/; revision=19083
2006-08-30 05:03:16 +00:00
Anders Broman
eb8862e1ef Add CLNP over TCP over TPKT dissection. The port number is by default set to 0.
svn path=/trunk/; revision=19082
2006-08-29 22:18:39 +00:00
Jörg Mayer
5b99f21735 Florent DROUIN <florent.drouin@alcatel.fr>:
Fix http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1077

svn path=/trunk/; revision=19074
2006-08-29 16:31:00 +00:00
Greg Morris
a9e704bc96 Fixes and updated files:
File NCP2222.py:
1. Added NCP service type 0xffff = All types
2. Added evaluation of task states. (following bits are defined. 0=normal, 1 = TTS explicit transaction in progress, 2= TTS implicit transaction in progress, 4 = Shared file ste lock in progress)
3. Reversed the Volume Request Flags, this was backwards (s/b 0=do not return name with volume number, 1=Return name with volume number)
4. Fixed endianess of Creator ID in NetWare Information Struct.
5. File information structure incorrectly defined Current Block Being Decompressed.
6. Logical Lock Status structure incorrectly identified Task Number as a byte. It should be two bytes "word".
7. Fixed endianess of Modifier ID in NetWare Information Struct.
8. Fixed Name Space Information structure (was defined as Name Space, changed to Creator Name Space Number).
9. Fixed Semaphore Structure (Task Number was incorrectly defined as a byte, should be two bytes "word").
10. Added Task structure (Task Number, Task State)
11. Fixed Volume structure (incorrectly defined Volume Name)
12. Added VolumeWithName structure (This struct contains both volume number and volume name)
13. Added error 0x8901 - "No purgable files available"
14. Added error 0x8977 - "Buffer too small" 
15. Added error 0x899c - "No more trustees found"
16. Added error 0x89d9 - "Queue station is not a server"
17. Added NCP connection status values (0=Ok, 1=Bad service connection, 10=File server is down, 40=Broadcast Message Pending)
18. Fixed error definitions for NCP 22/50.
19. Fixed reply packet for NCP 22/52 to properly display volume information depending on reply struct, Volume or volume with name.
20. Fixed error definitions for NCP 22/52
21. Fixed NCP 23/26 reply packet to properly return internet address and display correctly.
22. Fixed NCP 23/27 Reply packet structure to properly repeat connection numbers array.
23. Fixed error definitions for NCP 23/33
24. Fixed NCP 23/114 Request (improperly defined Charge Information as a long value, s/b word)
25. Fixed NCP 23/120 Reply (Improperly defined Job Number as a long value, s/b word)
26. Fixed error definitions for NCP 23/123
27. Fixed error definitions for NCP 23/124
28. Fixed error definitions for NCP 23/131
29. Fixed error definitions for NCP 23/132
30. Fixed error definitions for NCP 23/135
31. Fixed error definitions for NCP 23/137
32. Fixed error definitions for NCP 23/138
33. Fixed NCP 23/205 Reply (User Login Allowed incorrectly defined as long value, s/b byte value)
34. Fixed NCP 23/234 Reply (Reply structure incorrectly defined based on old NCP documentation. Corrected per new docs)
35. Fixed endianess of NCP 23/237 Reply on value Number of Locks.
36. Fixed endianess of NCP 23/238 Reply on value Number of Locks.
37. Fixed error definitions for NCP 30
38. Fixed error definitions for NCP 36/6
39. Fixed error definitions for NCP 86/2
40. Fixed error definitions for NCP 86/3
41. Fixed error definitions for NCP 86/4
42. Fixed error definitions for NCP 86/5
43. Fixed error definitions for NCP 87/1
44. Fixed error definitions for NCP 87/4
45. Fixed error definitions for NCP 87/5
46. Fixed error definitions for NCP 87/10
47. Fixed error definitions for NCP 87/11
48. Fixed error definitions for NCP 87/12
49. Fixed error definitions for NCP 87/17
50. Fixed error definitions for NCP 87/18
51. Fixed NCP 87/20 Reply to properly decode multiple entries returned. This used to only dissect the first entry.
52. Fixed error definitions for NCP 87/30
53. Fixed NCP 87/33 Reply to properly utilize the request flags to dissect the reply packet NetWare Info Struct
54. Fixed error definitions for NCP 87/33
55. Fixed error definitions for NCP 88/22
56. Fixed error definitions for NCP 89/1
57. Fixed error definitions for NCP 89/10
58. Fixed NCP 89/11 Request packet structure
59. Fixed error definitions for NCP 89/11
60. Fixed NCP 89/20 Reply to properly decode multiple entries returned. This used to only dissect the first entry.
61. Fixed error definitions for NCP 104/5
62. Added undefined NCP 112
63. Fixed NCP 123/11 Reply to properly dissect FileName, Name, and copyright.
64. Fixed NCP 123/17 Reply to properly display NCP Network Address values.
65. Fixed NCP 123/24 Reply to properly display Driver Board Name, Driver Short Name, and Dirver Logical Name.
66. Fixed error definitions for NCP 123/33
67. Fixed NCP 123/60 to properly display Set Command Name and Set Command Value.
68. Fixed error definitions for NCP 123/70
69. Fixed NCP 123/71 Reply to utilize new File Information Struct
70. Fixed error definitions for NCP 123/71
71. Fixed error definitions for NCP 123/72
72. Added NCP 123/249
73. Added NCP 123/251
74. Added NCP 123/252
75. Added NCP 123/253
76. Added NCP 123/254
77. Added NCP 123/255
78. Fixed error definitions for NCP 131/1
79. Fixed error definitions for NCP 131/2
 
File packet-ncp2222.inc
1. Added new NCP preference setting to tell Wireshark to decode the NetWare information structure as new or old style.
2. Set default NCP preference settings of echo connection and echo file to FALSE.
3. Added NDS verb 2 Request Flags (0=retain old object, 1=delete old object)
4. Fixed problem where NDS fragmentation could not be reassembled on reload. (fragment array needed to be re-initialized on reload)
5. Fixed NCP service types 1111, 5555, bbbb, and 1111/LIP to reflect real type number. (Was defined as 0xf1, 0xf2, 0xf3, etc... Now defined as 0x1, 0x5, 0xb, etc)
6. Fixed function build_expert_data to parse subtree memory structures to acquire NCP request value records
7. Fix NDS attribute type Boolean to byte value and properly aligned.
8. Fixed attribute zendmSearchOrder to display properly regardless of number or order of value entries.
9. Added check of length of packet prior to attempting to defragment
10. Added for Request packets logic to abort if NCP type isn't found.
11. Added logic to store packet length and then manually decode NCP function 123 based on length.
12. Added logic to manually dissect NCP 87/20 and 89/20 reply packets.
13. NDS resolve name replies with remote entry as the specifier should not store the EID returned (0x00000000)
14. Added logic to trap and echo to expert tap when connection status flags indicate an error.
15. Added manual dissect of NCP 23/26 replies
16. Added logic to Capture the EID returned form NCP 22/51 "Get vol info".
17. Fixed NDS verb 0x2a
18. Fixed NDS verb 0x2b
 
File packet-ncp.c
1. Fix offset for packet signature. (This used to automatically set the offset to account for packet signature if it could not determine the correct NCP type. But for some failed fragment packets, retransmissions, etc, this would be wrongly identified. So first we check to see if we can read a valid type at the offset before we just automatically assume that packet signature is being used)
2. Register the new NCP preference for old/new NetWareInfoStruct.
 
File packet-ncp-int.h
1. Add extern declaration for ncp_newstyle setting.
2. Add length, req_mask, and req_mast_ext to ncp_req_hash_value structure
 
File packet-ncp-sss.c
1. Fix SecretStore request verb Write App Secrets, Client Put Data, to evaluate packet length.

svn path=/trunk/; revision=19073
2006-08-29 08:45:53 +00:00
Tomas Kukosa
10db04c78b get rid of few warnings
svn path=/trunk/; revision=19072
2006-08-29 08:33:52 +00:00
Gerald Combs
9257393ede Add a missing file.
svn path=/trunk/; revision=19071
2006-08-29 02:19:27 +00:00
Gerald Combs
95e1e5a790 Fix a typo.
svn path=/trunk/; revision=19068
2006-08-28 22:52:26 +00:00
Ulf Lamping
4ad1f977d2 add a new this/that flag value
svn path=/trunk/; revision=19066
2006-08-28 21:14:36 +00:00
Ulf Lamping
18b2bf8992 minor format string change
svn path=/trunk/; revision=19065
2006-08-28 21:13:37 +00:00
Ulf Lamping
72b1b767b3 add some more right-hand-side infos of the tower data
svn path=/trunk/; revision=19064
2006-08-28 21:12:44 +00:00
Jaap Keuter
6be339868d Fix length check for IP packets with options.
svn path=/trunk/; revision=19062
2006-08-28 19:15:08 +00:00
Jörg Mayer
79221e2d94 Donald White <donald_white@qwest.net>
There is a small bug in the function dissect_ppp() which prevents proper
demuxing of packets.  Patch is attached.



svn path=/trunk/; revision=19061
2006-08-28 16:55:03 +00:00
Greg Morris
736793fca9 Fix the decoding of SLP attributes. Open SLP has the ability to pass back multiple attribute types in each reply. Previously the dissector only would dissect address attributes. The change adds parsing of attributes and proper dissection of names and address attributes contained in the same reply payload.
svn path=/trunk/; revision=19060
2006-08-28 12:24:24 +00:00
Tomas Kukosa
539102ca60 - new function ssl_dissector_delete()
- register H.225.0 over TLS (configurable port 1300)
- register SIP over TLS (fixed port 5061)
- new function proto_tree_get_root()

svn path=/trunk/; revision=19059
2006-08-28 07:05:02 +00:00
Anders Broman
c2bc366392 More release 6 changes.
svn path=/trunk/; revision=19058
2006-08-28 05:32:16 +00:00
Gerald Combs
8961a58ee1 Don't abort the entire program if we have bad data. Just mark the
packet as malformed and continue on our merry way.  This should fix
bugs 1064 - 1073.

Fix up whitespace.

svn path=/trunk/; revision=19057
2006-08-28 02:06:28 +00:00
Anders Broman
65267d932f Do some more of the relase 6 stuff.
svn path=/trunk/; revision=19056
2006-08-27 20:30:01 +00:00
Ulf Lamping
36d80b8c8b squelch some compiler warnings
svn path=/trunk/; revision=19052
2006-08-27 11:27:47 +00:00
Graeme Lunt
8618db09eb An octet string form of the ASO-qualifier used by some systems from the days when it was an ANY.
Really just an elaboration of the "...".


svn path=/trunk/; revision=19050
2006-08-27 09:03:21 +00:00
Graeme Lunt
e05d92d07c Register tpkt as a dissector so subdissectors can register tpkt on ports other than 102.
svn path=/trunk/; revision=19049
2006-08-27 08:31:29 +00:00
Graeme Lunt
7428612ae0 Support for X.500 strong authentication - used by DAP, DISP, DSP and DOP.
svn path=/trunk/; revision=19048
2006-08-27 08:19:55 +00:00
Ronnie Sahlberg
a5f6c6cdbf two more chunks
svn path=/trunk/; revision=19045
2006-08-26 12:26:19 +00:00
Ronnie Sahlberg
318b5d8e99 fix wrong constant in a valuestring
add two more chunks to be dissected


svn path=/trunk/; revision=19044
2006-08-26 11:57:28 +00:00
Ronnie Sahlberg
39d99904f8 initial PNG dissector (Portable Network Graphics)
svn path=/trunk/; revision=19042
2006-08-26 09:16:38 +00:00
Guy Harris
86c158a4db Don't define the Aironet/Cisco Wireless OUI ourselves; get it from
<epan/oui.h>.

Fix indentation.

svn path=/trunk/; revision=19038
2006-08-26 00:06:40 +00:00
Guy Harris
90a3563fa5 Fix some compiler warnings (some by getting rid of variables unused if
you don't have GNU TLS).

svn path=/trunk/; revision=19037
2006-08-26 00:05:26 +00:00
Guy Harris
c0540294d7 Don't use %ld for guint64 - use PRIu64. (Also, don't use %d for guint32
- use %u.)

svn path=/trunk/; revision=19036
2006-08-26 00:03:59 +00:00
Ronnie Sahlberg
0899de4bd5 remove the code that conditionally dissects LG only if IG is set
svn path=/trunk/; revision=19034
2006-08-25 21:53:37 +00:00
Ronnie Sahlberg
19f3809cc6 from Stephen F
ethernet IG/LG bit changes   with minor modifications

(only dissect LG if it is a unicast address
 put a hint what locally administered means in the dissect tree
)
 


svn path=/trunk/; revision=19033
2006-08-25 21:33:23 +00:00
Tomas Kukosa
200da0f7e4 commit forgotten file
svn path=/trunk/; revision=19028
2006-08-25 11:28:00 +00:00
Guy Harris
3f7a918917 If the length of a GSS token is zero, it's a null token, and the opaque
data shouldn't be dissected.

svn path=/trunk/; revision=19027
2006-08-25 08:10:35 +00:00
Tomas Kukosa
ce4e15b76d new ssl_dissector_add() function which can be called from another dissectors (similar to dissector_add())
svn path=/trunk/; revision=19026
2006-08-25 08:07:26 +00:00