aboutsummaryrefslogtreecommitdiffstats
path: root/epan/uat.h
AgeCommit message (Collapse)AuthorFilesLines
2015-05-28Use an "Open" instead of a "Save" dialog for UAT prefs.Gerald Combs1-0/+7
When selecting a file for a PT_TXTMOD_FILENAME UAT preference, use QFileDialog::getOpenFileName instead of QFileDialog::getSaveFileName. This matches current GTK+ behavior and the two preferences that use PT_TXTMOD_FILENAME. Add a comment noting that the PT_TXTMOD_FILENAME is Open-only. Bug: 11027 Change-Id: I29eb056422949eda700d448621e508cf094fd7b7 Reviewed-on: https://code.wireshark.org/review/8678 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18Fix comments to reflect reality.Guy Harris1-5/+0
Change-Id: I63aeb49e442eb6eba5cdf35ded221894c1d0ea6c Reviewed-on: https://code.wireshark.org/review/7223 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Make UAT record update callbacks return a success/failure indication.Guy Harris1-10/+21
Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18Remove some apparently-unnecessary includes of emem.h.Guy Harris1-2/+0
Change-Id: Ib7d1b587b439ff21ec6b7f1756ce6ccf25b66f80 Reviewed-on: https://code.wireshark.org/review/6635 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13UAT error string pointers should not be const pointers.Guy Harris1-11/+13
UAT error strings are usually allocated by g_strdup() or g_strdup_printf(), and must ultimately be freed by the caller. Make the pointer-to-error-string-pointer arguments to various functions be "char **", not "const char **". Fix cases that finds where a raw string was being used, as that won't work if you try to free it; g_strdup() it instead. Add a missing free of an error string. Remove some no-longer-necessary casts. Remove some unnecessary g_strdup()s (the string being handed to it was already g_malloc()ated). Change some variable declarations to match. Put in XXX comments for some cases where the error string is just freed, without being shown to the user. Change-Id: I40297746a2ef729c56763baeddbb0842386fa0d0 Reviewed-on: https://code.wireshark.org/review/6525 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-12Remove emem APIs from UAT functionality.Michael Mann1-26/+50
Change-Id: I009c09f25d170e5c9aaaef713eaacb3252817856 Reviewed-on: https://code.wireshark.org/review/6460 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-17Don't use ctype.h routines.Guy Harris1-1/+1
That avoids locale dependency and handles possibly-signed chars (which we weren't always doing before). Change-Id: Ieceb93029252f646397b6488f2df8a57c6d2a23d Reviewed-on: https://code.wireshark.org/review/4794 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06Convert all the other function-defining macros.Guy Harris1-15/+15
(Perhaps C2099 will finally deprecate old-style function definitions and allow you to declare parameters without names, just as C++ does, and compilers will - obviously - not warn about those parameters being unreferenced, obviating the need for __attribute((unused))__ and the like. And perhaps monkeys will fly out of....) Change-Id: Iff295c1854e66eb4f9e02cdd5761e0191d371365 Reviewed-on: https://code.wireshark.org/review/4018 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06Try to suppress MSVC++ unused parameter warnings.Guy Harris1-5/+11
I haven't found a way to with MSVC to mark parameters in the argument list as unused. MSVC doesn't give warnings about them in C code, but does appear to give them with C++ code. An answer to http://stackoverflow.com/questions/3020584/avoid-warning-unreferenced-formal-parameter suggests not giving the formal parameter a name in C++. Have a macro UNUSED_PARAMETER(), which takes as an argument a variable name, and expands to nothing in C++ and to the variable name followed by _U_ in C, and use that for some unused parameters. If it works, we'll use it for all of them. Change-Id: I76107bed037f1f0d94615adb42234c9faf83b4db Reviewed-on: https://code.wireshark.org/review/4016 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-16Remove now-unused functions.Evan Huus1-10/+1
Change-Id: Iecf230d493b31ecab25b33c67323987459b23bd7 Reviewed-on: https://code.wireshark.org/review/2242 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') (Double space between star and $Id$) Change-Id: If9b8f345e3b6493de0b573600e60005c8b0b33c3 Reviewed-on: https://code.wireshark.org/review/877 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-03Fix all -fstrict-alias warnings found by gcc 4.1.2Gilbert Ramirez1-2/+2
The majority of the fixes are for calls to uat_new(). Instead of having each caller cast its private data to (void**), we use void* in the uat_new() API itself. Inside uat_new(), we cast the void* to void**. Some dissectors use val64_string arrays, so a VALS64() macro was added for those, to avoid using VALS(), which is useful only for value_string arrays. packet-mq.c was changed because dissect_nt_sid() requires a char**, not a guint**. All other callers of dissect_nt_sid() use char*'s (and take the address of it) for their local storage. So, this was changed to follow the other practices. A confusion between gint and absolute_time_display_e in packet-time.c was cleared up. The ugliest fix is the addition of ip6_guint8_to_str(), for exactly one caller. The caller uses one type of ip6 address byte array, while ip6_to_str() expects another. This new function is in place until the various address implementations can be consolidated. Add VALS64() to the developer documentation. Change-Id: If93ff5c6c8c7cc3c9510d7fb78fa9108e4552805 Reviewed-on: https://code.wireshark.org/review/48 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2013-12-10Use PT_TXTMOD_NONE for columns that should not be editable.Irene Rüngeler1-0/+3
svn path=/trunk/; revision=53906
2013-12-08Fix some warnings: cast discards `__attribute__((const))' qualifier from ↵Jakub Zawadzki1-7/+7
pointer target type svn path=/trunk/; revision=53875
2013-12-03Rename struct _uat_t to epan_uatJakub Zawadzki1-1/+1
Leave typedef (uat_t) unchanged. svn path=/trunk/; revision=53767
2013-12-03Dissectors should not use dfilter.h, don't include it.Jakub Zawadzki1-0/+2
XXX ncp2222 dissector is using dfilter_compile(), why? svn path=/trunk/; revision=53766
2013-11-10Add missing includes in order to remove exceptions.h from proto.h (next commit).Jakub Zawadzki1-0/+2
svn path=/trunk/; revision=53230
2013-08-10Fix (-W)documentation error found by ClangAlexis La Goutte1-1/+1
../../epan/uat.h:245:23: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] * @param num_items_ptr ~~~~~~~~~~~~~~~~~~~^ 1 error generated. svn path=/trunk/; revision=51257
2013-07-25Add a UAT dialog. Make UAT preferences uat_t * instead of void *.Gerald Combs1-3/+11
C++-ize the UAT headers. Add an ElidedLabel widget. Use it in the File Set, Profile, and UAT dialogs. Update the Qt README. svn path=/trunk/; revision=50896
2013-03-12From beroset:Anders Broman1-2/+2
remove C++ incompatibilities from UAT_VS_DEF macro and all uses https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48259
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-0/+17
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-02-17Remove C++ incompatibilities in c1222 dissector.Michael Mann1-2/+2
Also addresses an implicit cast in the epan/uat.h file Bug 8342 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8342) svn path=/trunk/; revision=47721
2013-02-08Constify the second argument to uat_load(), to squelch some warnings.Guy Harris1-1/+1
svn path=/trunk/; revision=47560
2013-01-04replace "unsigned" datatype with "guint". Some mpeg files needed "unsigned ↵Michael Mann1-10/+10
int" instead. bugs 7825-7827 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7825) svn path=/trunk/; revision=46928
2012-12-26Fix a bunch of warnings.Guy Harris1-2/+2
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-07-08UATs could be put into "categories". The categories were defined onlyGuy Harris1-8/+9
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-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-05-03Fix a typo.Anders Broman1-1/+1
svn path=/trunk/; revision=42401
2012-03-30Recreate the packet list when changing UAT for header fields.Stig Bjørlykke1-0/+1
This fixes a crash when changing settings for fields used as a custom column. svn path=/trunk/; revision=41840
2012-01-25Fix usage of g_ascii_strdown() and g_ascii_strup() - they do *not*Guy Harris1-1/+4
modify the string in place, they return a g_mallocated modified version of the string passed into them. svn path=/trunk/; revision=40727
2011-11-01Remove comma at the end of several enumerator lists.Jeff Morriss1-3/+3
svn path=/trunk/; revision=39700
2011-09-20From Dirk via bug 6361:Stig Bjørlykke1-6/+20
Add a File/Directory Dialog as a field type for UAT preferences. svn path=/trunk/; revision=39058
2010-10-30Set maximum value for UAT range in fld_data, not cbdata.chk/set/tostr.Stig Bjørlykke1-1/+1
Both _set_cb and chk_range uses fld_data as max in range_convert_str(). This bug was found when the range max check from bug 4768 was fixed in revision 34698. svn path=/trunk/; revision=34722
2010-10-29Make the third argument to a UAT copy callback a size_t (not that any ofGuy Harris1-1/+1
the callbacks we have use that argument - is it really needed?). svn path=/trunk/; revision=34694
2010-06-28Introduce an Object Identifier field macro, together with an appropriate fieldGraeme Lunt1-0/+23
check routine. Also, a field type which is an enumerated string value. svn path=/trunk/; revision=33343
2010-03-04From LEGO via bug 3459:Stig Bjørlykke1-2/+18
Add a callback to UAT to be called after the table has being updated, use it to renew the snmp_ue_cache. svn path=/trunk/; revision=32112
2010-02-16Update the uat_new documentation to match the actual function.Bill Meier1-4/+8
svn path=/trunk/; revision=31898
2009-09-13s/g_strdown/g_ascii_strdownJeff Morriss1-1/+1
svn path=/trunk/; revision=29882
2009-04-20More constification, fewer warnings.Guy Harris1-14/+14
svn path=/trunk/; revision=28094
2009-04-20Constify some items to squelch some compiler warnings in the WindowsGuy Harris1-17/+17
buildbot; based on a patch from Chris Maynard, with some additional changes to squelch GCC warnings on UN*X. svn path=/trunk/; revision=28093
2009-03-16Clean up some P64 issues; we assume that no strings in UATs are biggerGuy Harris1-8/+11
than 2^31-1 (if they are, truncating the length to 32 bits is probably the least of our problems). svn path=/trunk/; revision=27735
2009-03-13From Jakub Zawadzki (bug 3331):Stig Bjørlykke1-5/+5
g_free() is NULL safe, so we don't need check against it. svn path=/trunk/; revision=27718
2009-03-08Don't use ep_strndup() to copy the uat protocol name, because the valueStig Bjørlykke1-1/+1
can be free'ed before we use it. Allocate the string like we do for other strings and copy/free the memory in the appropriate copy_cb/free_cb functions. This is only used in the DLT_USER table yet. svn path=/trunk/; revision=27663
2009-02-16Add an additional "title" attribute for UAT fields; that's what'sGuy Harris1-26/+29
displayed to the user. svn path=/trunk/; revision=27462
2008-08-05luis.ontanon@gmail.com => luis@ontanon.orgLuis Ontanon1-1/+1
svn path=/trunk/; revision=25937
2008-08-05(Temporary?) fix to get the Windows buildbot going again: remove constness ↵Jeff Morriss1-2/+2
from a couple of variables. svn path=/trunk/; revision=25935
2008-08-05Have some UAT helper functions copying the passed buffer beforeLuis Ontanon1-5/+8
freeing the contained buffer ( The client might have passed the contained buffer to avoid read-after-free ) svn path=/trunk/; revision=25928
2008-03-06Added an option to uat_new() to set if configuration shall be saved in theStig Bjørlykke1-0/+1
selected profile. Don't save SMI Paths and SMI Modules in the profiles because reloading currently doesn't work (bug 2309). svn path=/trunk/; revision=24580
2008-02-15Extend the UAT and preferences code so that you can use the "-o" flagGerald Combs1-40/+56
to override UAT entries from the command line, e.g. -o "uat:user_dlts:\"User 0 (DLT=147)\",\"http\",\"0\",\"\",\"0\",\"\"" Fix up white space. svn path=/trunk/; revision=24338
2008-01-30Add Luis' uat_get_table_by_name() to fetch SMI uat tables.Stig Bjørlykke1-0/+1
svn path=/trunk/; revision=24229