Commit Graph

24005 Commits

Author SHA1 Message Date
Stig Bjørlykke d01a2ac072 Bah, committed the wrong file.
Second try on allow custom columns when printing.

svn path=/trunk/; revision=24682
2008-03-18 00:11:52 +00:00
Stig Bjørlykke 3b4c2011cb Export get_column_custom_field from libwireshark.
svn path=/trunk/; revision=24680
2008-03-17 23:59:49 +00:00
Stig Bjørlykke aa20d2b34a Allow custom columns when printing.
svn path=/trunk/; revision=24679
2008-03-17 23:40:00 +00:00
Stig Bjørlykke 3c3c2224f9 Allow tshark to print custom columns.
svn path=/trunk/; revision=24678
2008-03-17 23:30:37 +00:00
Gerald Combs 30b7c91158 Fix a typo.
svn path=/trunk/; revision=24677
2008-03-17 23:19:49 +00:00
Gerald Combs 55b798b353 Bump the version in the trunk to 1.0.99 (which will become 1.1.0 at some
point).

svn path=/trunk/; revision=24676
2008-03-17 23:01:20 +00:00
Anders Broman 549b1275ea From Martin Peylo:
dissect TIPC encapsulated in TCP
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2335

svn path=/trunk/; revision=24674
2008-03-17 21:35:14 +00:00
Anders Broman 245d0ea29a From William Pursell:
Minor errors in the documentation, and an Ethereal reference

svn path=/trunk/; revision=24673
2008-03-17 21:26:54 +00:00
Anders Broman b0ab25b6ea add support for ND RDNSS (icmpv6)
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2364 (re written)

svn path=/trunk/; revision=24672
2008-03-17 21:21:48 +00:00
Gerald Combs f9c1aac9bb From Anders: Add a couple of entries to libwireshark.def.
svn path=/trunk/; revision=24670
2008-03-17 18:13:01 +00:00
Jeff Morriss dd11fc1385 Fix another crash from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1113 : conv_tables_t hold several g_malloc()'d things that need to be freed in smb_init_protocol() but the conv_tables themselves were se_ allocated so they have already been freed by the time we want to try to free them. Fix this by g_malloc()'ing them and freeing them after we've freed their contents.
svn path=/trunk/; revision=24669
2008-03-17 17:46:05 +00:00
Jeff Morriss a215dadd21 pol_value->name was g_malloc()'d which meant we needed to go through the hash table to free them all. But, like in http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1113 the pol_value's themselves are se_ allocated so they have already been freed when we want to traverse them. So, make pol_value->name se_ allocated so we don't have to do any cleanup on the hash table.
svn path=/trunk/; revision=24668
2008-03-17 17:40:54 +00:00
Gerald Combs 577f355e23 oid_get_default_mib_path() is present in libwireshark.def. Make sure it's
available even if HAVE_LIBSMI isn't defined.

svn path=/trunk/; revision=24667
2008-03-17 17:06:33 +00:00
Jeff Morriss 2ab2279eeb There are several g_malloc()'d things hanging off x11_conv_data_t's so don't se_ alloc that structure but rather g_malloc() it and free it after we've freed the contents. This fixes the X11 part of the crash from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1113
svn path=/trunk/; revision=24666
2008-03-17 16:55:28 +00:00
Jeff Morriss 74f8aef594 For Anders: add call_ber_oid_callback()
svn path=/trunk/; revision=24665
2008-03-17 14:17:00 +00:00
Jeff Morriss 19a95385be There are several g_malloc()'d things hanging off ldasp_conv_info_t's so don't se_ alloc that structure but rather g_malloc() it and free it after we've freed the contents. This fixes the LDAP part of the crash from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1113
svn path=/trunk/; revision=24664
2008-03-17 12:03:36 +00:00
Jaap Keuter d690541905 Add SMPP statistics by Abhik Sarkar
svn path=/trunk/; revision=24663
2008-03-17 07:33:13 +00:00
Jaap Keuter 9f82b15448 From Abhik Sarkar:
The attached patch changes the handling of the parameters in question to octet
string instead of string

svn path=/trunk/; revision=24662
2008-03-17 07:30:22 +00:00
Jeff Morriss 98522a39a9 Move the conversation addresses to the se_ allocator. This does not solve a memory leak but it does save a 12 line comment explaining why the const-ness of the pointers was being cast away and (more importantly) fixes the conversation part of the crashes detailed in http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1113 . In particular the conversation keys themselves are se_ alloc'd so by the time we get to conversation_init() (again) the keys have already been freed by the se_ allocator so traversing them isn't such a good idea.
svn path=/trunk/; revision=24661
2008-03-17 02:20:26 +00:00
Jeff Morriss a4436253ac Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway).
svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Anders Broman 85c905c9dd Add register_ber_oid_dissector_handle to the exported functions.
svn path=/trunk/; revision=24659
2008-03-16 19:38:22 +00:00
Guy Harris 02e090d46b Set rxinfo.epoch from the epoch, and then assign it to ts.secs; that
avoids doing a narrowing case - which, in this case, is safe
(rxinfo.epoch is 32 bits, and the value assigned to it is 32 bits, so
it's not as if it'd ever be wider than 32 bits even if ts.secs is wider
than 32 bits), but you might still have to think about it.

svn path=/trunk/; revision=24658
2008-03-16 19:36:09 +00:00
Stig Bjørlykke abb6a98fc9 Added a cast to make it compile.
svn path=/trunk/; revision=24657
2008-03-16 19:26:52 +00:00
Jeff Morriss 70a53138b3 From Peter Fuller: free pref_str in set_link_type() if preferences aren't set. From me: call get_credential_inf() at startup.
svn path=/trunk/; revision=24656
2008-03-16 15:29:13 +00:00
Jaap Keuter 2693fce57b From Gerhard Olsson:
Add "Assume COTP" prefererence instead of hard coding

If there is no current dissector registered for X25 and there is no hints in
the call packets, X25 tries to look at user data, then try heuristics. See end
of dissect_x25_common

This means that if the call data happens to start with 0x45, IP is assumed as
the data format even if the packet cannot be handled as IP (for instance too
short).

It is better to try the heuristics first as they should have more complete tests.

svn path=/trunk/; revision=24655
2008-03-16 10:19:51 +00:00
Jaap Keuter 9af351f536 From Peter Kjellerstedt
The base64 decoder in epan_base64_decode() returns an incorrect length (one
byte too many) for three out of four base64 coded strings. Please apply the
attached patch to correct this.

svn path=/trunk/; revision=24654
2008-03-16 09:54:00 +00:00
Jaap Keuter e2ee2bcab6 From Steve Karg:
Here is a modified patch that fixes the BACnet Schedule object Weekly_Schedule
decoding when an array index is used.  It also fixes the Priority_Array property 
when an array index is used.

svn path=/trunk/; revision=24653
2008-03-16 08:44:42 +00:00
Guy Harris cd2d7e0a6d Map "dcp.*" preferences to "dccp.*".
svn path=/trunk/; revision=24652
2008-03-16 08:26:16 +00:00
Jeff Morriss c84dbb230a From Chaskiel Grundman via http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1556: patch to track afs requests by rx connection id
svn path=/trunk/; revision=24651
2008-03-16 01:38:11 +00:00
Jeff Morriss b59322ecc1 Don't link plugins against libwireshark: any program that loads the dissector
plugins should already be linked against libwireshark.

Don't link capinfos and editcap against libwireshark: they only needed to be
because the plugins were linked against libwireshark (see rev 24123 and the
ensuing discussion on -dev).

capinfos and editcap: don't complain if plugins fail to load: dissector
plugins should fail to load because they need libwireshark.  I am assuming
here that wiretap plugins don't need libwireshark (I've never seen such a
plugin but LEGO's code and comments suggest this is the case).

(The goal of this checkin is to stop linking capinfos and editcap against
libwireshark while still allowing wiretap plugins.  Since we don't have any
such plugins in the tree I do somewhat doubt the need for all this but I don't
want to be the one to remove the functionality.)

svn path=/trunk/; revision=24650
2008-03-16 00:58:15 +00:00
Jeff Morriss ddca4dd583 Include epan/priveleges.h for get_credential_info()
svn path=/trunk/; revision=24649
2008-03-16 00:41:10 +00:00
Jeff Morriss d951728e6b Have started_with_special_privs() assert out if get_credential_info() was not
previously called.  This prevents the function from always returning TRUE in
programs that hadn't called get_credential_info().

Call get_credential_info() in the programs that should have been.

svn path=/trunk/; revision=24648
2008-03-16 00:32:12 +00:00
Guy Harris 6367e7c054 Oops, missed one name change.
svn path=/trunk/; revision=24647
2008-03-16 00:17:24 +00:00
Guy Harris d589b0523b OK, now use DCCP rather than DCP for the Datagram Congestion Control
Protocol.  (Better late than never....)

svn path=/trunk/; revision=24646
2008-03-16 00:03:13 +00:00
Guy Harris bcd666a74f Rename Distributed Checksum Clearinghouse protocol from "DCCP" to just
"DCC".  Googling for

	DCCP "Distributed Checksum Clearinghouse Protocol"

finds only hits related to Ethereal/Wireshark, either on the Ethereal or
Wireshark Web site, or on discussions where Datagram Congestion Control
Protocol developers were griping that Ethereal/Wireshark already used
DCCP for the Distributed Checksum Clearinghouse protocol.

Next step: fix the Datagram Congestion Control Protocol dissector.

svn path=/trunk/; revision=24645
2008-03-15 23:49:26 +00:00
Guy Harris 3cf6162f72 Get rid of a flag that's not used and that has no effect.
svn path=/trunk/; revision=24644
2008-03-15 23:01:12 +00:00
Jeff Morriss 689e8bd855 From http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1539 :
Hexadecimal and octal are unsigned.  Don't let dissectors register signed
fields (FT_INT*) to be displayed in hexadecimal (including HEX_DEC and DEC_HEX)
or octal.  Fix dissectors that do that mostly by changing the fields to
unsigned though in PANA it appears the fields are meant to be signed so
change those fields to be displayed in decimal.

This fixes an assertion crash in hfinfo_numeric_format() if/when someone tries
to create a filter using one of these mixed signed/unsigned fields (because
that routine does not know how to present the user with a signed value in
hex).

Also add FT_*INT64 to the "make sure it's not BASE_NONE" check.

svn path=/trunk/; revision=24643
2008-03-15 22:41:57 +00:00
Guy Harris 320c1117f6 Add a comment.
svn path=/trunk/; revision=24642
2008-03-15 20:14:29 +00:00
Gerald Combs fa42bcbd7b Make the document icon brighter and clean it up.
svn path=/trunk/; revision=24641
2008-03-15 19:46:26 +00:00
Gerald Combs 46bcad885a Check in the OS X packaging patch from bug 2341, since I've had
confirmation that the OS X package works on at least one system
other than my laptop.

svn path=/trunk/; revision=24640
2008-03-15 18:31:52 +00:00
Bill Meier dca49accfa Fix trivial spelling error
svn path=/trunk/; revision=24639
2008-03-15 18:17:52 +00:00
Anders Broman 2fbd6fcf1f Add register_ber_oid_dissector to the exported functions.
svn path=/trunk/; revision=24638
2008-03-15 11:40:49 +00:00
Gerald Combs 121e3d432e Try to fix distcheck again.
svn path=/trunk/; revision=24637
2008-03-15 00:21:02 +00:00
Gerald Combs b1bd2972ff Fix distcheck.
svn path=/trunk/; revision=24636
2008-03-14 23:43:35 +00:00
Gerald Combs 65a999d337 Updates and fixes.
svn path=/trunk/; revision=24635
2008-03-14 22:06:05 +00:00
Gerald Combs 7519d12f8f Make sure the Infiniband plugin is properly built and packaged.
svn path=/trunk/; revision=24634
2008-03-14 21:53:16 +00:00
Jaap Keuter 74178fafda From Dustin D. Trammell:
The FIX protocol dissector uses the 6 byte string "8=FIX." at the beginning of
the data to match the beginning of a FIX version string of the format
"8=FIX.x.x" in order to determine if the data is the FIX protocol or not.
With FIX 5.x and beyond, the beginning of the data will have a version string 
of the format "8=FIXT.x.x" to indicate the FIX Transport (FIXT) version.

A simple solution is to update the current FIX dissector to only match the
first 5 bytes of the version string (see attached patch).  This will cause a
match for FIX version 4.x and prior (8=FIX.x.x) as well as 5.x and beyond
(8=FIXT.x.x).

svn path=/trunk/; revision=24633
2008-03-14 21:36:01 +00:00
Stig Bjørlykke 5d9ca601d8 Added missing Id keywords, eol-style and ignore targets.
svn path=/trunk/; revision=24632
2008-03-14 19:48:49 +00:00
Stig Bjørlykke 3351980a29 Make infiniband plugin compile.
svn path=/trunk/; revision=24631
2008-03-14 19:35:54 +00:00
Stig Bjørlykke ccf85f3195 Added check for length in heuristic check so we don't dissect unknown
TCP packets with less than 5 bytes data as a malformed XCSL packet.

svn path=/trunk/; revision=24630
2008-03-14 19:03:56 +00:00