Commit Graph

25833 Commits

Author SHA1 Message Date
Gerald Combs 4bb3c4b8e2 Back out r26377 so that I can get 1.1.1 out the door.
svn path=/trunk/; revision=26391
2008-10-09 03:34:12 +00:00
Bill Meier 76c5103967 Minor cleanup in proto_reg_handoff; remove unused #include and typedefs
svn path=/trunk/; revision=26390
2008-10-09 01:20:02 +00:00
Gerald Combs b854d9e20f Update some comments.
svn path=/trunk/; revision=26384
2008-10-08 23:14:47 +00:00
Jaap Keuter 38cf4a2156 From Shane Kearns:
The L2CAP dissector assumes all packets on a connection oriented channel are
B-frames (basic mode, or v1.1 backwards compatibility).  
Retransmission mode or flow control mode (introduced in v1.2 bluetooth spec)
use I-frames and S-frames, which are described in the current 2.1 spec here:
Volume 3 (core, host volume) - Part A (L2CAP) - 3.3 (CONNECTION-ORIENTED
CHANNEL IN RETRANSMISSION/FLOW CONTROL MODES).

svn path=/trunk/; revision=26383
2008-10-08 20:33:55 +00:00
Jaap Keuter bb250894fd From Karl Heinz Wolf:
This patch adds support for DHCPv4 coordinate-based Location Configuration
Option 123, as proposed by RFC 3825.
The decoding functionality is based on the RFC3825decoder by Klaus Darilion
http://www.enum.at/rfc3825encoder.529.0.html

svn path=/trunk/; revision=26381
2008-10-08 18:26:53 +00:00
Anders Broman 07ccec7bcb 3GPP TMSI STATUS IE decoding does not update curr_offset
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2945

svn path=/trunk/; revision=26379
2008-10-08 16:09:28 +00:00
Stig Bjørlykke 35ccef4882 Update services
svn path=/trunk/; revision=26378
2008-10-08 12:45:30 +00:00
Stig Bjørlykke e5713e2956 Remove a space, which I think was accidentally added in r26012.
svn path=/trunk/; revision=26377
2008-10-08 12:30:22 +00:00
Stig Bjørlykke 0334c55d9f Update manuf
svn path=/trunk/; revision=26376
2008-10-08 12:18:02 +00:00
Gerald Combs 57a1c7be61 Try for another 1.1.1 development release.
svn path=/trunk/; revision=26374
2008-10-07 21:29:25 +00:00
Gerald Combs b6f8143e3b If we auto-discover http_proxy, export it so that wget can pick it up. Change
the shebang to use /bin/bash since we use bash-isms in the script.

svn path=/trunk/; revision=26373
2008-10-07 19:47:28 +00:00
Stig Bjørlykke 7e3514c200 Add a hidden preference to show the version in the welcome page.
svn path=/trunk/; revision=26371
2008-10-07 15:18:40 +00:00
Stig Bjørlykke 66f160728f Fix printing of version in welcome page.
svn path=/trunk/; revision=26370
2008-10-07 14:06:44 +00:00
Jaap Keuter 9a3accd9b1 Fix for bug 2944:
Textual correction: Unnumbered Information format-> Unconfirmed Information format, among others.

svn path=/trunk/; revision=26369
2008-10-07 07:29:32 +00:00
Jaap Keuter cd17e5036d Fix for bug 2638:
Add support for XOT PVC setup dissection.

svn path=/trunk/; revision=26368
2008-10-07 06:52:15 +00:00
Gerald Combs a6bb39afe3 Add a hidden preference to set the welcome screen title.
svn path=/trunk/; revision=26366
2008-10-06 22:49:01 +00:00
Guy Harris 49f7ce426b Put a newline at the end of the file.
svn path=/trunk/; revision=26365
2008-10-06 21:47:39 +00:00
Anders Broman 0dcea98bb2 Remove experimental dissector.
svn path=/trunk/; revision=26363
2008-10-06 20:31:56 +00:00
Anders Broman 1f25f93a07 From Sven Eckelmann:
B.A.T.M.A.N. dissector consists of many source files

svn path=/trunk/; revision=26362
2008-10-06 20:24:02 +00:00
Anders Broman cee238507d From Kari Tiirikainen:
Req/resp tracking and service response time stats for GTP-C

svn path=/trunk/; revision=26361
2008-10-06 20:11:44 +00:00
Stig Bjørlykke 81633df2db Also use conversation index in the generated dst_ref.
svn path=/trunk/; revision=26357
2008-10-06 15:24:20 +00:00
Bill Meier a7e61da1b3 Minor cleanup related to proto_register and/or proto_reg_handoff
ep_alloc + memset --> ep_alloc0 (teamspeak2)

svn path=/trunk/; revision=26356
2008-10-05 23:08:54 +00:00
Jaap Keuter 94201f9daa From Alex Turbov:
Sniffing native ICQ client I've found that SNAC(0x13,09) may contains more than
one buddy to modify. Also in attached patch enhanced decoders for SNACs
0x18-0x1B of family 0x13.

svn path=/trunk/; revision=26355
2008-10-05 15:12:20 +00:00
Jaap Keuter 56feadb6b7 From Pascal Quantin:
The attached patch fix several bugs in the decoding function to display the
Cell Channel Description (44.018 chapter 10.5.2.1b) and the Frequency List
(44.018 chapter 10.5.2.13) information elements content.
Without this patch the ARFCNs displayed are completely wrong.

svn path=/trunk/; revision=26354
2008-10-05 09:30:24 +00:00
Ronnie Sahlberg 2b739fc611 use g_malloc/g_free instead of malloc/free
svn path=/trunk/; revision=26353
2008-10-05 08:41:44 +00:00
Jaap Keuter 62e4dd4459 From Colin O'Flynn:
The idea is that there is now some hardware that can put 802.15.4 frames over
Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with
the Ethertype set to a value indicating the payload is 802.15.4.

Since there is no official ETHTYPE designated by the IEEE, the number 0x809A
is used in this code. However a preference is added to the "IEEE 802.15.4" type
in the preference dialog allowing you to change this ethtype to something else.

The hardware for those interested is the Atmel Raven USB Stick.

svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
Ronnie Sahlberg 54716f411b change u_char to unsigned char to make the osx compiler happy
svn path=/trunk/; revision=26351
2008-10-05 00:51:28 +00:00
Ronnie Sahlberg d83b8b0336 kerberos/gss enhancements
add a parameter *datalen to decrypt_krb5_data() so that we can pass back 
the length of the decrypted blob back to the caller.
This is useful for when there are "junk" at the end of the blob and thus 
the decrypted data is not the same size as the encrypted blob.
GSS CFX is one such example.
(we should have done this earlier since it might have made some other 
stuff easier to imlement...)


make the preference setting krb_decrypt a globally visible variable so 
we can see its value and act on it from callers of krb decryption from 
outside of packet-kerberos.c    i.e.   from GSS CFX


Make keytype == -1  a wildcard that when passed to decrypt_krb5_data() 
will try any/all encryption keys.
This since GSS CFX does not provide the enctype in the GSS layer.
(The GSS CFX enctype is only negotiated during the AP-REQ/REP  so we 
should later pick this value up and store it in a CFX session variable.
That is for a later enhancement.
)


Enhance the GSS decryption (that for hitorical reasons are implemented 
in packet-spnego.c  and not packet-gssapi.c :-)  )
to also handle decryption of GSS CFX

This should make wireshark able to decrypt any/all GSSAPI  RFC4121 
packets, if the keytab file is provided.


I have successfully decrypted LDAP using GSS CFX with AES encryption 
with this.




svn path=/trunk/; revision=26350
2008-10-05 00:28:36 +00:00
Jaap Keuter af8ff96739 Add safety against possible endless loop.
svn path=/trunk/; revision=26349
2008-10-04 18:00:35 +00:00
Sake Blok 8b82ba219b Add support for dissecting the 802.1t System ID Extensions
within the Bridge Identifiers.

(Inspired by http://packetlife.net/blog/2008/sep/26/vlan-challenge/)


svn path=/trunk/; revision=26348
2008-10-03 22:11:13 +00:00
Stig Bjørlykke acd4e734c9 From Mattias Nissler (bug 2936):
Fix some gpointer casts.

svn path=/trunk/; revision=26347
2008-10-03 17:01:08 +00:00
Ronnie Sahlberg c621fb6a25 document the new -K argument
svn path=/trunk/; revision=26346
2008-10-03 15:59:00 +00:00
Stig Bjørlykke 6882a5cd1a Several improvements:
- Split SEQ/ACK analysis into SEQ analysis (pr msg) and ACK analysis
  (pr dest/ackinfo entry) to correctly handle multicast messages.
- Improved dump of timestamp (in units of 100ms).
- Show Address PDU with 0 dest entries as Ack-Ack PDU.
- Print correct number of missing sequence numbers in Ack.
- Indicate end of list entry in Ack.
- Message ID is unsigned.

svn path=/trunk/; revision=26345
2008-10-03 14:58:53 +00:00
Guy Harris 8a3dcb7922 Export read_keytab_file(), which is used outside libwireshark.
svn path=/trunk/; revision=26344
2008-10-03 06:53:55 +00:00
Ronnie Sahlberg 24b76bdc14 add a -K command line option to provide the name of the kerberos keytab
file to use for decryption of Krb5 and GSS-KRB


svn path=/trunk/; revision=26343
2008-10-03 05:21:28 +00:00
Ronnie Sahlberg 5c82d9b784 samr enhancements
svn path=/trunk/; revision=26342
2008-10-03 03:14:48 +00:00
Ronnie Sahlberg b94c255167 the security info bitmask is 4 bytes, not 2
svn path=/trunk/; revision=26341
2008-10-03 02:48:52 +00:00
Ronnie Sahlberg 48cabe4f20 SAMR updates
svn path=/trunk/; revision=26340
2008-10-03 02:39:17 +00:00
Stig Bjørlykke 2a4ddda66a Added option to decode as BER encoded ASN.1.
Dump as data if no decoding.

svn path=/trunk/; revision=26339
2008-10-02 15:47:06 +00:00
Stig Bjørlykke 55cc2f5adc Decode content according to given content type.
svn path=/trunk/; revision=26338
2008-10-02 15:45:54 +00:00
Jaap Keuter 9be273b75b From Frank Kingswood:
LeCroy instruments use the VICP protocol to carry GPIB messages over Ethernet.

svn path=/trunk/; revision=26337
2008-10-02 06:53:28 +00:00
Anders Broman fc95c5333f From Sven Eckelmann:
B.A.T.M.A.N. dissector doesn't dissect gateway clients correct and has problems with truncated packets
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2869

svn path=/trunk/; revision=26336
2008-10-02 06:29:28 +00:00
Ronnie Sahlberg ab6a6c07cb samr updates
svn path=/trunk/; revision=26335
2008-10-02 06:05:05 +00:00
Ronnie Sahlberg 740708750e fix typo
svn path=/trunk/; revision=26334
2008-10-02 04:56:22 +00:00
Gerald Combs 98df50f70b Make sure any data structures we allocate are properly initialized. Fixes
bug 2922.

svn path=/trunk/; revision=26333
2008-10-02 04:55:51 +00:00
Ronnie Sahlberg 097839cac0 enhancements to SAMR
svn path=/trunk/; revision=26332
2008-10-02 04:45:56 +00:00
Stephen Fisher 30d7ab211e From Jelmer Vernooij via enhancement bug #2929:
Tie the IRC dissector to port 57000 for dircproxy and
other IRC proxies.


svn path=/trunk/; revision=26331
2008-10-02 03:46:23 +00:00
Ronnie Sahlberg 8f8f84f6ae update to SAMR
svn path=/trunk/; revision=26330
2008-10-02 00:07:54 +00:00
Anders Broman bc7779c4c4 Use LUA 5.1.4
svn path=/trunk/; revision=26329
2008-10-01 19:38:27 +00:00
Anders Broman f0f2cb8cbe Fix:MPEG PES decode reports "Malformed Packet" when PES packet length is 0
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2229

svn path=/trunk/; revision=26328
2008-10-01 18:30:16 +00:00