aboutsummaryrefslogtreecommitdiffstats
path: root/epan/emem.c
AgeCommit message (Collapse)AuthorFilesLines
2008-01-07From Jim Young (bug 2162):Stig Bjørlykke1-2/+2
Patch for epan/emem.c functions ep_strndup() and se_strndup() to stop valgrind message "invalid read of size 1". svn path=/trunk/; revision=24023
2007-12-04rework how emem trees indexed by strings so that traversing the tree Ronnie Sahlberg1-73/+92
will traverse the entries in the lexical order of the key. add a flag to lookup/insert for strings to specify whether a case insensitive key should be used instead of a (default) case sensitive key. svn path=/trunk/; revision=23736
2007-12-04for nested trees, teach emem about which nodes contain a pointer to a Ronnie Sahlberg1-9/+22
subtree and which nodes that contain a pointer to user data teach emem to be able to traverse nested trees svn path=/trunk/; revision=23733
2007-12-03add tree traversal functionsRonnie Sahlberg1-0/+40
svn path=/trunk/; revision=23725
2007-11-28(Somewhat academic): Fix fread related bug (when using GTK1).Bill Meier1-1/+1
svn path=/trunk/; revision=23650
2007-08-28SNMP:Luis Ontanon1-3/+2
- As noted by Thomas Anders values are not added to the tree anymore. Move the calling of subdissectors to the end of the function, so that the value is added to the tree. - add port 8161 to be decoded as SNMP (hey, it's on IANA's services file!) UAT: - do not have the uat reloaded. OIDS: - do not complain if renaming an OID to an identical name svn path=/trunk/; revision=22704
2007-05-29Check for G_GINT64_MODIFIER in Wireshark as we do in Wiretap.Guy Harris1-2/+2
In all the places where a cast to "long long" or "unsigned long long" was done, use G_GINT64_MODIFIER and get rid of the cast, as 1) there's no guarantee that "%ll" works and 2) there's no guarantee that "long long" works (the latter definitely does *NOT* work with MSVC++; the former doesn't work with regular printf in MSVC++, but it might work with the GLib printf-based functions). svn path=/trunk/; revision=21978
2007-05-29From David Howells :Sebastien Tandel1-2/+2
Fix compilation failures when building wireshark-0.99.6-SVN-21916 on an x86_64-unknown-linux-gnu target with gcc version 4.1.2 20070403 (Red Hat 4.1.2-8). The failures fall into two categories: (1) Casts between pointers and 32-bit integers without an intermediary cast via 'long' or 'unsigned long'. This results in a compiler warning complaining about casts between a pointer and an integer of a different size. (2) Passing values to "%lld" or similar printf-style format options that the compiler thinks are a different size. Such values need to be cast to 'long long' or 'unsigned long long'. svn path=/trunk/; revision=21975
2007-04-28In emem_tree_lookup_string(), return NULL if the allocation fails.Guy Harris1-1/+1
svn path=/trunk/; revision=21612
2007-04-28In calls to the emem_tree routines, forcibly align items not known to beGuy Harris1-25/+39
aligned on 32-bit boundaries. svn path=/trunk/; revision=21611
2007-04-23Add some GCC warnings to the standard set, and add some others to theGuy Harris1-2/+2
--enable-extra-gcc-checks set. If we turn on -pedantic, try turning on -Wno-long-long as well, so that it's not *so* pedantic that it rejects the 64-bit integral data types that we explicitly require. Constify a bunch of stuff, and make some other changes, to get rid of warnings. Clean up some indentation. svn path=/trunk/; revision=21526
2007-04-04Fix build failures due to windows.h being included before winsock2.h via ↵Graham Bloice1-5/+5
other includes svn path=/trunk/; revision=21335
2007-01-25Squelch Coverity CIDs 225, 226, and 227.Gerald Combs1-1/+9
svn path=/trunk/; revision=20552
2007-01-15instead of simply doing an assert when running out of memory in emem, throw ↵Ulf Lamping1-3/+11
a new OutOfMemoryError Exception, so file.c can show at least a better explanation to the user before Wireshark terminates XXX - to prevent a busy wait, I need a portable way to wait for a short time period, like Sleep() for Windows svn path=/trunk/; revision=20437
2006-11-15fix a warningUlf Lamping1-1/+1
svn path=/trunk/; revision=19907
2006-11-11fix so that tcp.pdu.time works again.Ronnie Sahlberg1-1/+22
it broken in one of the previous bugfixes to tcp add a function to print an emem tree to the console for easier emem tree debugging svn path=/trunk/; revision=19877
2006-08-17add trees with PErmanent allocation scope which will be useful for constructingRonnie Sahlberg1-0/+17
associative arrays for globally unique and persistent mappings such as oid to name sid to name guid to name svn path=/trunk/; revision=18937
2006-08-14make creation of subtrees used for the _array tree type use the same ↵Ronnie Sahlberg1-15/+35
allocation scope as its parent and thus become allocation scope agnostic change all accessor functions to be defines to the emem_tree_ functions. now to create a tree with a different scope we only need to create a new ..._tree_create() function and set up the appropriate defines (it was a mistake to call the functions se_tree_create and se_tree_create_non_persistent, they should be the other way around i.e. se_tree_create_persistent and se_tree_create ) svn path=/trunk/; revision=18895
2006-08-14rename some structures and defines from the se_tree to the emem_tree prefixRonnie Sahlberg1-80/+80
svn path=/trunk/; revision=18894
2006-08-12put a memory allocator function pointer inside the tree structure so that ↵Ronnie Sahlberg1-6/+8
all accessor functions become storage scope agnostic svn path=/trunk/; revision=18888
2006-08-12rename some inline functions from se_ to emem_ prefix as a first step to ↵Ronnie Sahlberg1-15/+15
generalize teh tree management and to use trees with different storage scope without too much code duplication. it would be useful with a tree that had indefinite storage instead of the emem functions which commonly have ep or se storage scope. indefinite storage scope would be useful for example for managing a global and static set of well known guid to name mappings(not yet implemented) and also for oid to name mappings. svn path=/trunk/; revision=18886
2006-06-20From Albert Chin:Anders Broman1-6/+16
Fix some C++ comments in C source files and fixes some non-constant initializations. svn path=/trunk/; revision=18521
2006-06-17Not all UN*Xes have MAP_ANONYMOUS; some have MAP_ANON instead, and someGuy Harris1-1/+20
have neither. For those with MAP_ANON but not MAP_ANONYMOUS, use MAP_ANON; for those with neither, add some code to use "/dev/zero". svn path=/trunk/; revision=18488
2006-06-16From Albert Chin Jaap Keuter1-1/+1
HP-UX doesn't have MAP_ANON but it does have MAP_ANONYMOUS. Moreoever, according to mmap(2) on RHEL: MAP_ANONYMOUS The mapping is not backed by any file; the fd and offset argu- ments are ignored. This flag in conjunction with MAP_SHARED is implemented since Linux 2.4. MAP_ANON Alias for MAP_ANONYMOUS. Deprecated. svn path=/trunk/; revision=18486
2006-05-31Tethereal/tethereal -> TShark/tshark.Gerald Combs1-2/+2
svn path=/trunk/; revision=18268
2006-05-28Ethereal->WiresharkAnders Broman1-3/+3
svn path=/trunk/; revision=18234
2006-05-21name changeRonnie Sahlberg1-2/+2
svn path=/trunk/; revision=18197
2006-05-18Improve fix for Bug 915 by using GetVersionEx() as it is recommended by ↵Lars Roland1-7/+12
Microsoft. Tested on Win98 SE. svn path=/trunk/; revision=18183
2006-05-17attempt to fix #915:Ulf Lamping1-2/+6
if the GetVersionEx() call fails, force the dwPlatformId to VER_PLATFORM_WIN32_WINDOWS so the return value from VirtualProtect() won't trigger an assert. svn path=/trunk/; revision=18178
2006-05-15Change return value checking to the true meaning of the spec:Jaap Keuter1-2/+2
"If the function succeeds, the return value is nonzero." This may or may not solve bug 915. svn path=/trunk/; revision=18168
2006-05-02Not all compilers support unnamed struct/union fields withinGuy Harris1-13/+13
structs/unions (GCC supports it "for compatibility with other compilers"; presumably that's not for compatibility with the version of Sun C that rejected it - was that a PCCism?). svn path=/trunk/; revision=18072
2006-04-28Fix logic used to test protection under Windows OT. Only initializeGerald Combs1-14/+27
our page size and OS version information once. svn path=/trunk/; revision=18025
2006-04-26If we're running under Windows 95/98/Me, don't abort if we can't protectGerald Combs1-15/+21
our guard pages. svn path=/trunk/; revision=18011
2006-03-18rename se_tree_lookup32_less_than_or_equal()Ronnie Sahlberg1-1/+1
to se_tree_lookup32_le() svn path=/trunk/; revision=17664
2006-03-18add new se_tree_lookup32_less_than_or_equal() callRonnie Sahlberg1-0/+88
svn path=/trunk/; revision=17663
2006-03-11revert back to svn 17587Ronnie Sahlberg1-18/+59
svn path=/trunk/; revision=17597
2006-03-11oops removed one check too manyRonnie Sahlberg1-0/+3
when we lookup grandparent, check that we actually have a grandparent. svn path=/trunk/; revision=17596
2006-03-11remove some redundant calls and checks and pass the required pointers as ↵Ronnie Sahlberg1-59/+15
parameters instead to make it slightly faster svn path=/trunk/; revision=17589
2006-03-11give se_trees names so that it is easier to debug and to log how often ↵Ronnie Sahlberg1-3/+5
certain trees are accessed svn path=/trunk/; revision=17587
2006-03-11forgot to paint a node causing massively unbalanced treeRonnie Sahlberg1-28/+27
svn path=/trunk/; revision=17575
2006-03-10avoid doing the lookup of a key twice while inserting items to a tree with ↵Luis Ontanon1-5/+85
an array key. svn path=/trunk/; revision=17570
2006-03-10fix missing return bug from didierRonnie Sahlberg1-1/+1
svn path=/trunk/; revision=17564
2006-03-10make using canaries optionalRonnie Sahlberg1-3/+49
default to use-canaries since that is the current behaviour svn path=/trunk/; revision=17563
2006-03-10add a define that controls explicitely whether we want to use guard pages ↵Ronnie Sahlberg1-11/+18
(if available) or not. let it default to want-guard-pages since the existing code does that. svn path=/trunk/; revision=17562
2006-03-07From Jeff Morriss:Gerald Combs1-19/+35
emem.c wouldn't compile with EP_DEBUG_FREE and SE_DEBUG_FREE defined. The attached patch fixes that and cleans up some warnings that showed up with those two were defined, too. (In fact 95% of the patch is for warnings.) Fix up whitespace. svn path=/trunk/; revision=17500
2006-03-07Rename set_string_hash... into se_tree_xxx_string as proposed by ronnie for ↵Luis Ontanon1-7/+2
consistency whith its real nature. svn path=/trunk/; revision=17496
2006-03-07use an elaborated key for the string keyed "hash table"Luis Ontanon1-54/+60
svn path=/trunk/; revision=17491
2006-03-07Add a hash table with string keys based on the red/black tree.Luis Ontanon1-0/+70
svn path=/trunk/; revision=17485
2006-03-06add helper to build (red/black) trees from a key that is a vector of guin32 ↵Ronnie Sahlberg1-1/+67
arrays. test this functionality by calling these vector insert/lookup tree functions from the nfs dissector for when filehandles are used as a key. these vector functions could also be used to efficiently store conversations : se_tree_key_t[6] = { { addr_len/4, &src_addr }, { addr_len/4, &dst_addr }, { 1, &src_port32 }, { 1, &dst_port32 }, { 1, &protocol32 }, { 0, NULL } } (the nfs dissector needs a LOT of work. It is very painful to work with very large nfs traces with all the memory it wastes (and eats) as well as how slow all the tables make it) svn path=/trunk/; revision=17477
2006-03-05initial implementation of binary tree support with se allocation scopeRonnie Sahlberg1-0/+326
this is to test out a basic implementation of binary trees and the api required for the helpers svn path=/trunk/; revision=17467