Commit graph

163 commits

Author SHA1 Message Date
Gerald Combs
a6bbdaa849 Fix some dead code and zero division issues found by Clang scan-build.
In convert_string_case() use g_utf8_strup() instead of converting each
character by hand. Hopefully this won't cause any unexpected changes in
behavior.

svn path=/trunk/; revision=36006
2011-02-18 22:43:48 +00:00
Jeff Morriss
376d57fcd9 Use g_error() (with a hopefully-useful error message) instead of g_assert() to report problems with preference registrations.
svn path=/trunk/; revision=35683
2011-01-27 17:31:41 +00:00
Jaap Keuter
fc4d25fcc4 Allow for NULL preference descriptions.
svn path=/trunk/; revision=35242
2010-12-22 06:25:33 +00:00
Stephen Fisher
fabe85aa2e Change default for "Welcome screen and title bar shows version" to on per
discussion in this thread on the wireshark-dev mailing list:

    http://www.wireshark.org/lists/wireshark-dev/201011/msg00151.html


svn path=/trunk/; revision=35113
2010-12-03 21:52:05 +00:00
Stephen Fisher
28fa4266d7 Add "Length" as a new default column on a trial basis between the protocol
and info columns per discussion on -dev list:

    http://www.wireshark.org/lists/wireshark-dev/201011/msg00151.html 


svn path=/trunk/; revision=35068
2010-11-29 20:43:24 +00:00
Stephen Fisher
b18e8fd1ca Resolve bug #2254: Migrate the 802.1q VLAN dissector into the Ethernet II.
svn path=/trunk/; revision=34838
2010-11-10 22:37:30 +00:00
Stig Bjørlykke
b1e1dcb54b Support empty column titles.
svn path=/trunk/; revision=34777
2010-11-04 11:37:06 +00:00
Jeff Morriss
6eba069093 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4768 :
Return an error if the user specifies a value in a range in excess of the
range-specified maximum.

Except when reading in preferences files which might have ranges that exceed
the maximum (because we didn't use to check): in that case silently lower the
out-of-range values.

svn path=/trunk/; revision=34698
2010-10-29 22:09:31 +00:00
Jeff Morriss
710a96470f If we get a syntax error reading the preferences file, tell which preference we were reading when we got the error.
svn path=/trunk/; revision=34655
2010-10-27 01:43:24 +00:00
Stig Bjørlykke
21319003d5 Added an extra validity check for cust_format_info.
svn path=/trunk/; revision=34235
2010-09-24 13:19:03 +00:00
Stig Bjørlykke
f5ab6c1930 Store "Show Resolved" setting for custom columns.
svn path=/trunk/; revision=34220
2010-09-23 19:41:55 +00:00
Sake Blok
7364bef1b3 When using a custom column, make it possible to select which occurrence to show if the field has multiple occurrences.
svn path=/trunk/; revision=34186
2010-09-22 20:56:14 +00:00
Stig Bjørlykke
afd6761f46 A GString has it's own length.
svn path=/trunk/; revision=34034
2010-08-31 18:28:59 +00:00
Stig Bjørlykke
f75b4ae02b Support space in list of hidden columns.
This fixes bug 5163.

svn path=/trunk/; revision=34033
2010-08-31 15:02:03 +00:00
Jeff Morriss
486562f263 Add some code to prefs_cleanup() to free (most of the) memory associated with the preferences. This only happens during shutdown so it's not fixing a memory leak, but it makes me more comfortable to know where the preferences memory is freed.
svn path=/trunk/; revision=33874
2010-08-21 04:26:26 +00:00
Stephen Fisher
a81a8dd250 Modernize the SONMP ("SynOptics Network Management Protocol") dissector by renaming it to NDP ("Nortel Discovery Protocol") and do some basic cleanup.
svn path=/trunk/; revision=33815
2010-08-16 17:19:42 +00:00
Anders Broman
c9a7fade6a From Cal Turney:
Optionally display Wireshark version in the main window's title bar.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5040

svn path=/trunk/; revision=33729
2010-08-07 14:37:37 +00:00
Guy Harris
deae609c44 Backing out r33631 for now - it has a number of issues.
svn path=/trunk/; revision=33646
2010-07-28 01:12:41 +00:00
Anders Broman
2bd0983a36 From Cal Turney:
Optionally display Wireshark version in the main window's title bar.
(Modified to include SVN version).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5040

svn path=/trunk/; revision=33631
2010-07-26 13:23:30 +00:00
Stig Bjørlykke
7b64be6a80 Revert COL_DSCP_VALUE back to value set in packet-ip.c.
Right justify COL_DSCP_VALUE (and COL_DCE_CALL as in the old packet list).

svn path=/trunk/; revision=33430
2010-07-05 09:05:27 +00:00
Stig Bjørlykke
beb4314276 Introduce "Show Resolved" as an option in custom columns. This will determine
if we show the value or the string representing the value.

This setting is not stored in the preferences file yet, and the option is
not available in the columns preferences window.

svn path=/trunk/; revision=33317
2010-06-25 06:42:34 +00:00
Stig Bjørlykke
2e5c2b805f Check for custom column before using custom_field.
Store hidden columns correctly.

svn path=/trunk/; revision=33288
2010-06-22 13:40:28 +00:00
Stig Bjørlykke
737c0e843b Always make new columns visible.
svn path=/trunk/; revision=33285
2010-06-22 11:09:07 +00:00
Jaap Keuter
a47dfc3efa Fix for bug 4888:
Convert DSCP column to the proper custom column filter code.

svn path=/trunk/; revision=33269
2010-06-20 18:23:35 +00:00
Stig Bjørlykke
d3e1e2df1e Added "Hide Column" functionality.
svn path=/trunk/; revision=33266
2010-06-20 16:23:43 +00:00
Jeff Morriss
12b5361a7b Remember the default value of each protocol preference.
If, when we're writing the preferences file, the current value of the
preference is the same as the default, write out the preference (since the
preference file is also the documentation for the preferences) but comment it
out (so that if, for example, you go back to an older version of Wireshark
you won't get warnings about non-existant preferences that you didn't
change--and thus probably don't care too much about).

It might be interesting to, in the future, add a UI to restore the default
values.

svn path=/trunk/; revision=32967
2010-05-26 03:31:30 +00:00
Jeff Morriss
ea0c9d6b14 Reindent a bit
svn path=/trunk/; revision=32960
2010-05-26 01:51:41 +00:00
Jeff Morriss
c420b83ee5 find_val_for_string() is only used in prefs.c so remove the prototype
and make it static.

When reading enum preferences, use the current value of the preference as the
default value of the preference instead of a hard-coded 1.  This way if we
couldn't find the appropriate value we'll don't end up changing the preference
to something that may or may not make sense.

svn path=/trunk/; revision=32950
2010-05-25 20:57:14 +00:00
Guy Harris
36623bcb71 From H.sivank: GtkOSXApplication support.
Call the various flavors of OS X integration just "OS X integration",
not anything with "IGE" in it - it appears that, in some places,
"ige-mac-integration" refers only to the older Carbon-based functions,
although the library still appears to be called -ligemacintegration.

Update the URLs for the information about the OS X integration
libraries.

Clean up help message for --with-pcap-remote.

Clean up white space a bit.

Speaking of white space, it's "Mac OS X", not "MacOS X".

svn path=/trunk/; revision=32941
2010-05-25 00:35:44 +00:00
Guy Harris
e1e576c11b Support monitor mode in the capture preferences.
Use prefs_is_capture_device_hidden() to find out whether a device should
be hidden - don't scan the list of hidden devices ourselves.

svn path=/trunk/; revision=32820
2010-05-15 19:38:13 +00:00
Stig Bjørlykke
7385fd55bd Use correct name for gprs-ns.
svn path=/trunk/; revision=32514
2010-04-19 10:34:52 +00:00
Stig Bjørlykke
d5b16e1f97 Revision 32295 renamed "nsip" to "gprs_ns".
svn path=/trunk/; revision=32513
2010-04-19 10:23:41 +00:00
Balint Reczey
e24d953fe1 Disable OID resolution and loading SMI modules by default.
Add an option to enable OID resolution.
Add an option to suppress errors reported by libsmi.

svn path=/trunk/; revision=32096
2010-03-03 17:19:30 +00:00
Bill Meier
9d663d7081 Fix various gcc -Wshadow warnings.
svn path=/trunk/; revision=31720
2010-01-28 18:45:46 +00:00
Stig Bjørlykke
ff9123acbe Cleanup the escape/unescape underscore in Packet List column headers.
We only have to do this when actually set or get the title from the widget.

svn path=/trunk/; revision=31689
2010-01-26 23:05:40 +00:00
Gerasimos Dimitriadis
c08fa6f3cf Move underscore escaping/unscaping function to strutil.c;
Update decoding of IS-801 Request GPS Acquisition Assistance

svn path=/trunk/; revision=31685
2010-01-26 18:21:17 +00:00
Stig Bjørlykke
1c1eb9021a Handle escape/unescape underscore when read/write the preferences
column.format entries.  Also fix a small memory leakage.

svn path=/trunk/; revision=31670
2010-01-25 21:45:17 +00:00
Stig Bjørlykke
17a01968d9 Ensure we don't write outside the pref_str in put_string_list().
This bug was introduced in revision 31487, when putting each
column.format entry on separate lines.

svn path=/trunk/; revision=31653
2010-01-25 10:22:00 +00:00
Anders Broman
759c418158 From Jim Young:
Patch to write "column.format:" preference values pairs to separate lines.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4380

svn path=/trunk/; revision=31487
2010-01-11 08:00:56 +00:00
Stig Bjørlykke
47be3577a7 Introduce "Ignore Packet" in the packet list.
This will remove the package from the dissection functions without
removing it from the capture file.

svn path=/trunk/; revision=31287
2009-12-17 01:18:14 +00:00
Anders Broman
ce39b29305 Make the filter toolbar style a preference.
svn path=/trunk/; revision=30136
2009-09-25 05:19:18 +00:00
Kovarththanan Rajaratnam
d75778eb4a Custom columnfication:
* Deprecate COL_DCE_CTX ("Context ID). Use dcerpc.cn_ctx_id

svn path=/trunk/; revision=29797
2009-09-08 14:59:26 +00:00
Kovarththanan Rajaratnam
bc845e056c Custom column deprecation:
We fill out the COL_DSTIDX column by using 'pinfo->dst_idx'. This member is only set by the MDS Header dissector based on 'mdshdr.dstidx'. So remove COL_DSTIDX and migrate to 'mdshdr.dstidx' custom column.

svn path=/trunk/; revision=29795
2009-09-08 14:29:08 +00:00
Kovarththanan Rajaratnam
62af6eff84 Custom column deprecation:
We fill out the COL_SRCIDX column by using 'pinfo->src_idx'. This member is only set by the MDS Header dissector based on 'mdshdr.srcidx'. So remove COL_SRCIDX and migrate to 'mdshdr.srcidx' custom column.

svn path=/trunk/; revision=29794
2009-09-08 14:26:09 +00:00
Kovarththanan Rajaratnam
2cf14900d2 Custom column deprecation:
We fill out the COL_RXID column by using 'pinfo->rxid'. This member is only set by the Fibre Channel dissector based on 'fc.rx_id'. So remove COL_RXID and migrate to 'fc.rx_id' custom column.

svn path=/trunk/; revision=29793
2009-09-08 14:21:14 +00:00
Kovarththanan Rajaratnam
cdfeebdd26 Custom column deprecation:
We fill out the COL_OXID column by using 'pinfo->oxid'. This member is only set by the Fibre Channel dissector based on 'fc.ox_id'. So remove COL_OXID and migrate to 'fc.ox_id' custom column.

svn path=/trunk/; revision=29792
2009-09-08 14:17:36 +00:00
Kovarththanan Rajaratnam
a108023b2a COL_BSSGP_TLLI is deprecated
svn path=/trunk/; revision=29721
2009-09-05 18:39:46 +00:00
Stig Bjørlykke
e275d24c39 Ignore preferences for deleted protocols "etheric" and "isup_thin".
svn path=/trunk/; revision=29709
2009-09-05 13:06:45 +00:00
Bill Meier
94f28dd8f9 (FWIW) One step towards including stdio.h & stdlib.h only when req'd.
svn path=/trunk/; revision=29568
2009-08-26 19:27:49 +00:00
Anders Broman
2dd60e1b66 Custom columnfication:
* Deprecate COL_BSSGP_TLLI (GPRS BSSGP IE TLLI). Use bssgp.tlli

svn path=/trunk/; revision=29546
2009-08-25 05:42:14 +00:00