Commit Graph

114 Commits

Author SHA1 Message Date
Guy Harris 8ea4df97e0 Use g_ascii_isalnum() rather than isalnum().
Only *ASCII* alphanumerics are allowed in filterable field names, so use
g_ascii_isalnum() to check for them.  That avoids issues with characters
with the 8th bit set and avoids locale-dependent behavior.

Change-Id: I4e3c4eec907f5e576629229fcf154fcf728b7a2e
Reviewed-on: https://code.wireshark.org/review/4973
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-28 18:19:15 +00:00
Gerald Combs 7ac3ed366c Fix unused variable warnings found by clang.
Change-Id: I31ff6d9bfcedfc1e3cab4e191d8dbf8de347abb1
Reviewed-on: https://code.wireshark.org/review/1065
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-11 01:32:13 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Bill Meier 11b5c15fdb Remove trailing whitespace
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0
Reviewed-on: https://code.wireshark.org/review/385
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-25 20:46:49 +00:00
Anders Broman 95ed1b4977 As spotted by Joerg; make a HFILL_INIT(hf) macro and use it to init the private part of the hf structure.
svn path=/trunk/; revision=54843
2014-01-19 09:40:04 +00:00
Guy Harris f862fc40ba Don't cast away constness.
svn path=/trunk/; revision=54800
2014-01-14 18:35:36 +00:00
Anders Broman 9c05ac141d Fix a typo.
svn path=/trunk/; revision=54617
2014-01-06 17:12:54 +00:00
Anders Broman ef399fb652 Try to fix warning: initializer element is not computable at load time.
svn path=/trunk/; revision=54616
2014-01-06 15:30:01 +00:00
Evan Huus b2e5e4a81a First round converting OIDs from emem to wmem. Just internal functions so far.
svn path=/trunk/; revision=54420
2013-12-23 20:52:12 +00:00
Evan Huus a6415ece0a Rename a couple of to_str functions to have ep_ in the name. This makes it
obvious that the returned string is ephemeral, and opens up the original names
in the API for versions that take a wmem pool (and thus can work in any scope).

svn path=/trunk/; revision=54249
2013-12-19 15:49:09 +00:00
Guy Harris db25270df8 Move the epan/filesystem.c routines to wsutil; they're not specific to
packet dissection, they're specific to the entire Wireshark suite of
programs.

svn path=/trunk/; revision=53377
2013-11-17 02:55:14 +00:00
Bill Meier 21bed98150 Fix several [-Wunused-const-variable] warnings (using '#if 0').
svn path=/trunk/; revision=52866
2013-10-26 03:16:57 +00:00
Michael Mann 3635bea0a4 Add OID unit tests. Bug 9294 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9294)
From Ed Beroset

svn path=/trunk/; revision=52692
2013-10-19 18:52:13 +00:00
Evan Huus 5344c7fef2 If the length we allocated was 0, don't try and write to the returned pointer.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9276

svn path=/trunk/; revision=52655
2013-10-16 22:52:40 +00:00
Evan Huus a6d8e1888c Fix a length check in the OID code, we add an extra byte if is_first, not the
other way around. Also add an assert so it blows up if we get it wrong, rather
than leading to uninitialized memory.

Fixes the last errors I can find in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9268

svn path=/trunk/; revision=52615
2013-10-15 12:34:45 +00:00
Evan Huus a50dee3286 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9246
Fix memory leaks and bad memory accesses in c1222 dissector.

From me: use realloc in a handoff function since it may get called multiple
times, and we only need the latest.

svn path=/trunk/; revision=52497
2013-10-10 16:18:49 +00:00
Evan Huus 69da562c83 Don't try and construct an OID string if the len is zero. Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9246

svn path=/trunk/; revision=52455
2013-10-08 21:12:06 +00:00
Michael Mann ee208c8dcc Add support for RELATIVE-OID ASN.1 type. Bug 9192 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9192)
From Ed Beroset.

svn path=/trunk/; revision=52393
2013-10-06 02:31:10 +00:00
Anders Broman 9973f5f880 From beroset@mindspring.com:
oid_subid2encoded generates faulty encodings for 3-, 4- and 5-byte subid values

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9188

svn path=/trunk/; revision=52219
2013-09-25 21:15:25 +00:00
Evan Huus 2d128b70bd Use epan-scope memory for OIDs, cleaning up another ~100KB of valgrind
complaints.

svn path=/trunk/; revision=51966
2013-09-12 12:16:15 +00:00
Evan Huus cad50146e3 Remove what appear to be the last two instances of pe_tree. Could this be the
first emem API to die?

svn path=/trunk/; revision=51756
2013-09-04 21:14:55 +00:00
Jeff Morriss 16ef3ce2f1 Restore inclusion of report_err.h
svn path=/trunk/; revision=50599
2013-07-15 03:06:00 +00:00
Jeff Morriss 54bb2e7a5c Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark).
svn path=/trunk/; revision=50598
2013-07-15 02:48:26 +00:00
Evan Huus b54d5b7d54 Fix the OID registration leaks.
Only 1,625 bytes to go...

svn path=/trunk/; revision=50565
2013-07-14 01:02:44 +00:00
Anders Broman 82e220f2bd Pretify dissection of date and Time.
svn path=/trunk/; revision=49905
2013-06-12 15:08:08 +00:00
Anders Broman bbb5aacd42 Show DisplayString as a string.
svn path=/trunk/; revision=49887
2013-06-11 16:35:06 +00:00
Jeff Morriss c2ced4a2ab Don't try to open <home>/.wireshark on Windows: Wireshark hasn't written to
that directory since 2001 and reading from that directory was only left in for
backwards compatibility with versions prior to r4702.  I think it's now safe
to remove that backwards compatibility.

This eliminates the last argument of get_persconffile_path().

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8437

svn path=/trunk/; revision=48797
2013-04-09 02:48:03 +00:00
Anders Broman f8a93562e0 [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48457
2013-03-21 17:52:43 +00:00
Anders Broman 39b85839b1 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48311
2013-03-15 05:42:24 +00:00
Jaap Keuter 23d2320dd0 Fixing CID 280433 and 280357.
Also strengthening the checking and debug presentation.

svn path=/trunk/; revision=47060
2013-01-14 07:43:14 +00:00
Guy Harris 8ed7a73e22 Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
Evan Huus ee5a8dd17d Do free overwritten names when registering oids. There was a comment claiming
we couldn't since the name might not be on the heap, but it looks to me like
we're always careful to put it on the heap via a g_strdup if necessary.

Fixes some minor memory leaks.

svn path=/trunk/; revision=45814
2012-10-27 21:01:41 +00:00
Jeff Morriss 3729335973 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45016
2012-09-20 01:48:30 +00:00
Evan Huus ad759c88f8 Safely handle empty OIDs and other weird cases where we can't find a sub-id.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7219

svn path=/trunk/; revision=44460
2012-08-12 21:04:39 +00:00
Jeff Morriss 8f12c9d7d7 First phase of fixing https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7380 :
Add a new name resolution option: whether or not use the configured (in the OS)
name resolver (e.g., DNS) to resolve network names.  When this option is disabled
but network name resolution is enabled then Wireshark will resolve only those
names that it can from local sources.  This includes (at least, AFAIK):

- name resolutions that Wireshark picks up on from DNS packets it decodes
- the "user hosts file" (~/.wireshark/hosts on *NIX)
- what Wireshark reads out of capture file (the PCAPNG name resolution block)

This new preference defaults to "use external resolvers" for backward
compatibility (so people turning on network name resolution will get the old
behavior).

This option can be set via Edit->Preferences and on the command line; there
remain several UIs (e.g., the "open capture file" dialog, the
View->Name Resolution menu, etc.) that don't have the new option yet.


Also expand on the "description" for the name resolution preferences: these
are used not only in the tooltips but are also written to the preferences
file.  The previous text didn't include enough context when written do the
preferences file.

svn path=/trunk/; revision=43605
2012-07-08 01:31:48 +00:00
Guy Harris 659cf0527a UATs could be put into "categories". The categories were defined only
implicitly by the #define name and string they were defined to; not all
UATs neatly fit into any of the categories, so some of them were put
into categories that weren't obviously correct for them, and one - the
display filter macro UAT - wasn't put into any category at all (which
caused crashes when editing them, as the GUI code that handled UAT
changes from a dialog assumed the category field was non-null).

The category was, in practice, used only to decide, in the
aforementioned GUI code, whether the packet summary pane needed to be
updated or not.  It also offered no option of "don't update the packet
summary pane *and* don't redissect anything", which is what would be
appropriate for the display filter macro UAT.

Replace the category with a set of fields indicating what the UAT
affects; we currently offer "dissection", which applies to most UATs
(any UAT in libwireshark presumably affects dissection at a minimum) and
"the set of named fields that exist".  Changing any UAT that affects
dissection requires a redissection; changing any UAT that affects the
set of named fields that exist requires a redissection *and* rebuilding
the packet summary pane.

Perhaps we also need "filtering", so that if you change a display filter
macro, we re-filter, in case the display is currently filtered with a
display filter that uses a macro that changed.

svn path=/trunk/; revision=43603
2012-07-08 01:00:46 +00:00
Jakub Zawadzki 500018d4f6 Fix compilation of epan/oids.c without HAVE_LIBSMI
svn path=/trunk/; revision=43583
2012-07-06 07:24:22 +00:00
Anders Broman c19583b72c From Michael Mann:
Generic preferences implementation - Printing and Name Resolution.

svn path=/trunk/; revision=43579
2012-07-06 04:48:36 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Bill Meier 781129806f Fix ex "modeline" so it works;
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748

svn path=/trunk/; revision=39081
2011-09-21 17:49:11 +00:00
Stig Bjørlykke 0554530407 From Dirk via bug 6361:
Use File/Directory Dialog as a field type for UAT preferences.

svn path=/trunk/; revision=39059
2011-09-20 10:15:09 +00:00
Guy Harris 0b2cb8a575 Squelch some compiler warnings.
svn path=/trunk/; revision=37684
2011-06-16 17:17:55 +00:00
Guy Harris 0aa46cb66c Get rid of unused function.
svn path=/trunk/; revision=37230
2011-05-18 00:29:48 +00:00
Guy Harris 8f53a5655c Make some routines static that aren't used outside the source file in
which they're defined.

Include some header files that declare functions in the source files
that define the functions.

Declare packet_list_get_type() in gtk/packet_list_store.h, as it defines
a macro that uses that function.

svn path=/trunk/; revision=37223
2011-05-17 23:33:23 +00:00
Guy Harris 4ae55217d0 This ain't C++; you have to put "void" in as the argument list of
functions that take no arguments, otherwise the function is treated as a
crufty old C function with undeclared arguments.

svn path=/trunk/; revision=37212
2011-05-17 21:28:07 +00:00
Stephen Fisher 4e974fdc7d Cast away some clang errors about cast alignments that appear safe.
svn path=/trunk/; revision=36848
2011-04-25 16:29:16 +00:00
Stephen Fisher ca8dfff3da Fix clang error ("increases requird alignment from 1 to 8") by removing
unnecessary VALS() cast


svn path=/trunk/; revision=36847
2011-04-25 16:19:07 +00:00
Stig Bjørlykke 62559137c4 Corrected decoding of oid values with length 5.
This fixes coverity 340.

svn path=/trunk/; revision=36230
2011-03-21 18:58:48 +00:00
Jaap Keuter 9e1d1e0e13 Allow presentation of Gauge32 values larger than 0x7FFFFFFF.
svn path=/trunk/; revision=35599
2011-01-20 20:04:39 +00:00
Guy Harris 17d4d51b7d Make the third argument to a UAT copy callback a size_t (not that any of
the callbacks we have use that argument - is it really needed?).

svn path=/trunk/; revision=34694
2010-10-29 21:11:33 +00:00