aboutsummaryrefslogtreecommitdiffstats
path: root/epan/addr_resolv.h
Commit message (Collapse)AuthorAgeFilesLines
* Corrects repeated words throughout the code.Moshe Kaplan2021-12-221-1/+1
| | | | | | | | Repeated words were found with: egrep "(\b[a-zA-Z]+) +\1\b" . -Ir and then manually reviewed. Non-displayed strings (e.g., in comments) were also corrected, to ease future review.
* epan: Convert to use stdio.h from GLibJoão Valverde2021-12-191-1/+1
| | | | | | | | | | | | | Replace: g_snprintf() -> snprintf() g_vsnprintf() -> vsnprintf() g_strdup_printf() -> ws_strdup_printf() g_strdup_vprintf() -> ws_strdup_vprintf() This is more portable, user-friendly and faster on platforms where GLib does not like the native I/O. Adjust the format string to use macros from intypes.h.
* Add files with WS_DLL_PUBLIC to DoxygenMoshe Kaplan2021-11-291-1/+1
| | | | | | | Add @file markers for most files that contain functions exported with WS_DLL_PUBLIC so that Doxygen will generate documentation for them.
* Edit Resolved Name: Don't add duplicate IPsDylan Ulis2020-02-241-3/+7
| | | | | | | | | | | | | | | | | 1. Switch list of manually resolved names from a list to a map (IP Address --> Custom Hostname) 2. If an address was already in the list, just update the old entry. Previously this added a new entry anytime somebody would edit a hostname. 3. Display the previous hostname in the GUI 4. Remove unused manually_resolve_cleanup() Bug: 11221 Change-Id: I42d5b6267eb6613bdf7783865bc2d30d6bda1147 Reviewed-on: https://code.wireshark.org/review/36059 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Add support for "custom" DNS servers to be used in address resolutionMichael Mann2019-09-151-0/+1
| | | | | | | | | | | | | | | | | Use the C-ARES ares_set_servers() API to set a list of DNS servers to use. The list of DNS servers is controlled through a UAT. There is also a boolean preference to determine if the custom list should be used. The boolean preference was added to arbitrate between the "default" list of servers that C-ARES creates during initialization and using the "custom" list (which may be empty and we don't want the "default" list to be overwritten) Bug: 15960 Change-Id: I4ba071777f6bb9bc2fef313b7618908d805c0690 Reviewed-on: https://code.wireshark.org/review/34419 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
* addr_resolv: function to convert an eth address into raw bytesMartin Kaiser2018-10-151-0/+3
| | | | | | | | | | | | | | | | | | | | | Add a function to convert a string that contains an ethernet address (including the colons) into a sequence of 6 bytes. Use the existing internal functions to parse an ethernet address. Declare the new function as local to libwireshark. It'll be used by wslua to support ethernet addresses. While at it, fix an incorrect comment about parse_ether_address(). If accept_mask is false, only a complete 6-byte ethernet address is accepted. Change-Id: Ib03306c44866fe97d3cbff2634411b7f5ec31a79 Reviewed-on: https://code.wireshark.org/review/30162 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* make IPv4 and IPv6 name resolution usable at all timesMartin Kaiser2018-09-031-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IPv4 and v6 name resolution are bound to a capture file. Using a lua script, it is possible to trigger a name resolution when no capture file is open. This crashes Wireshark as the hash tables for name resolution are not initialized at this time. martin@reykholt:~/src/wireshark.git/build$ echo "print(Address.ip(\"1.1.1.1\"))" > bla.lua martin@reykholt:~/src/wireshark.git/build$ ./run/tshark -Xlua_script:bla.lua Segmentation fault martin@reykholt:~/src/wireshark.git/build$ echo "print(Address.ipv6(\"::1\"))" > bla6.lua martin@reykholt:~/src/wireshark.git/build$ ./run/tshark -Xlua_script:bla6.lua Segmentation fault Make sure that the hash tables are available as long as the epan library is initialized. Add a new function host_name_lookup_reset(), call this function every time we set up dissection for a new capture file. This way, we keep the name resolution results separate per capture file. Reorder the steps in init_dissection(). Host name lookup is now available at all times, there's no need to be in file scope when it's initialized. Change-Id: I9599100d5f378b6a0f73dc630e4c8af3b3ffb2cc Reviewed-on: https://code.wireshark.org/review/29398 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Do IP address resolution synchronously before printing in TShark.Guy Harris2018-05-231-0/+8
| | | | | | | | | | | | | | | Otherwise, the first N packets printed, for a value of N dependent on various factors, won't get IP addresses resolved to names, even if the user wants them resolved. Unlike Wireshark, which, when a name is resolved in asynchronously, can go back and fix up the displayed packet when the asynchronous operation completes, once TShark has written packet data to the standard output, it can't go back and fix it if it did name resolution asynchronously. Bug: 14711 Change-Id: I8ebbd83103e5780c903b5560e01b7b92fa39c924 Reviewed-on: https://code.wireshark.org/review/27668 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Transition from GeoIP Legacy to MaxMindDB.Gerald Combs2018-03-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
* epan: use SPDX indentifiers.Dario Lombardo2018-02-081-13/+1
| | | | | | | | | | Skipping dissectors dir for now. Change-Id: I717b66bfbc7cc81b83f8c2cbc011fcad643796aa Reviewed-on: https://code.wireshark.org/review/25694 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Add a ws_in6_addr typedef for struct e_in6_addr.Guy Harris2017-10-261-3/+3
| | | | | | | | That allows a parallel typedef of ws_in4_addr for guint32. Change-Id: I03b230247065e0e3840eb87635315a8e523ef562 Reviewed-on: https://code.wireshark.org/review/24073 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Extract the "long name" out of the manuf file and use it for some resolutionMichael Mann2017-08-241-6/+0
| | | | | | | | | | | | | | | | | | | | | Some places (like MAC resolution) want to keep a fixed length, but for places that want to display "full organization name", save the long name that is treated as a comment in the manuf file. Have make-manuf convert companies with all caps to mixed case so we're not screaming the company name at the user. Convert the manuf.tmpl to be tab delimited without a comment for the "long name" so it can match the format now created by make-manuf. Remove uint_get_manuf_name as it was unnecessary. Bug: 3666 Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b Reviewed-on: https://code.wireshark.org/review/23150 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Remove dead code for address reverse-mappingJoão Valverde2017-07-201-8/+0
| | | | | | | | | | | | Removed get_ipxnet_addr(), get_ether_addr(). If this feature is desired at a minimum it should use an efficent data structure (and no disk-based lookups mid-dissection). Change-Id: Ie72449c631f21f4a3d82ec435bb5e1d7892f122c Reviewed-on: https://code.wireshark.org/review/22729 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
* Replace and remove enterprises_lookup_format()João Valverde2017-07-031-6/+0
| | | | | | | | | Change-Id: I27517bdfc4d00ee758d3795bd74e54968e70efad Reviewed-on: https://code.wireshark.org/review/22497 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
* Parse enterprise-numbers at run timeJoão Valverde2017-06-261-0/+26
| | | | | | | | | | | | | | | | | | | "enterprise-numbers" is converted to tab-separated values and renamed "enterprises". Unused fields are stripped. PENs are stored in a hash table loaded at run-time. User "enterprises" file is loaded from the personal config dir. Misc make-sminmpec.pl improvements and fixes. Note: names of type "Entity (formerly ...)" have the formerly part commented out for a cleaner output. Change-Id: I60c533afbe3e399077fbf432088064471ad3e1e2 Reviewed-on: https://code.wireshark.org/review/22246 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
* Attempt to clean up addr_resolv flags by removing DUMMY_ADDRESS_ENTRYAnthony Coddington2017-06-191-5/+4
| | | | | | | | | | | | Replace with easier to understand and already present NAME_RESOLVED given dummy address is always filled. Change-Id: If8464f89e88722aac70689749fe0d4a31c119db2 Bug: 13798 Reviewed-on: https://code.wireshark.org/review/22110 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
* Resolv: various code / comment cleanupsJaap Keuter2016-11-161-1/+1
| | | | | | | | | | | Various cleanups and corrections regarding MAC address handling. Change-Id: I31e2e377bc1c73705a89517c776d51bbb19b9ce3 Reviewed-on: https://code.wireshark.org/review/18836 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* MTP3: Added SS7 Point Code Name ResolutionBinh Trinh2016-10-121-0/+9
| | | | | | | | | | bug: 7592 Change-Id: I1af2c5d6664e172c358cd19bc20e9352c2582eae Reviewed-on: https://code.wireshark.org/review/17677 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* addr_resolv: change g_hash to wmem_map.Dario Lombardo2016-06-141-8/+8
| | | | | | Change-Id: Ice7533fbeac700dae0a46766838818a32b0d5736 Reviewed-on: https://code.wireshark.org/review/15051 Reviewed-by: Michael Mann <mmann78@netscape.net>
* Replace and remove host_ip_af() functionJoão Valverde2016-04-081-8/+0
| | | | | | | | Change-Id: I932c156cbc6883d1d63bf0457fd62cfb67c3340e Reviewed-on: https://code.wireshark.org/review/14750 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
* Remove synchronous DNS name resolutionJoão Valverde2016-04-041-1/+0
| | | | | | | | | Change-Id: Ie5e670b769eb0674950f3679ef511047641c2873 Reviewed-on: https://code.wireshark.org/review/14751 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Remove ADNS supportJoão Valverde2016-03-211-1/+1
| | | | | | | | | | Relevant mailing list message: https://www.wireshark.org/lists/wireshark-dev/201503/msg00007.html Change-Id: I0cff6d4d64fb52a651bcf6b28c183e43653b1cc2 Reviewed-on: https://code.wireshark.org/review/14519 Reviewed-by: João Valverde <j@v6e.pt>
* IEEE 802.1Q/VLAN: Resolve ID to a describing nameUli Heilmeier2016-03-181-0/+12
| | | | | | | | | | | | | | | | | A vlans file in the personal preference directory add an option to resolve VLAN IDs to a describing name. Format of vlan file is 123\tName of VLAN To enable the resolving the preference nameres.vlan_name must be set to TRUE. Bug: 11209 Change-Id: I3f00b4897aace89c03c57b68b6c4b6c8b7d4685a Reviewed-on: https://code.wireshark.org/review/14471 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
* Change some constness qualificationsJoão Valverde2016-02-111-4/+4
| | | | | | | | Change-Id: I0ece488f43aae27e7c055c2edacbf09ff11ce16d Reviewed-on: https://code.wireshark.org/review/13889 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
* Don't use IP address strings as "names" for MAC addresses.Guy Harris2016-01-191-4/+5
| | | | | | | | | | | | | | | Have a flag for addresses indicating whether the address is resolved to a name or whether its "name" is just a printable version of the address. If the name corresponding to an IP address isn't really a name, don't assign it to a MAC address. Clean up some code a bit (have a fill_dummy_ip6() corresponding to fill_dummy_ip4()). Bug: 10212 Change-Id: I9d0ffa2706be17842f832c64cea7acc5c1dc6536 Reviewed-on: https://code.wireshark.org/review/13412 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Rename ipv6-utils.h to ipv6.h.Guy Harris2016-01-031-1/+1
| | | | | | | | | | By analogy to ipv4.h. Change-Id: I147565b332024b1bb88e9cd15889255773d04524 Reviewed-on: https://code.wireshark.org/review/13034 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
* If you want struct e_in6_addr, include <epan/ipv6-utils.h>.Guy Harris2016-01-031-1/+0
| | | | | | | | | | | Don't just define it yourself. (And especially don't define it yourself if you're already including epan/ipv6-utils.h.) Change-Id: I9970d0edecef0c820b2a7fdce34509b54e7b3106 Reviewed-on: https://code.wireshark.org/review/13020 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Fix some constness issues [-Wcast-qual]João Valverde2016-01-031-2/+2
| | | | | | Change-Id: I111558df3d36436ddf5e2728f113b022cc48a713 Reviewed-on: https://code.wireshark.org/review/13013 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Export functions str_to_ip() and str_to_ip6() to pluginsJo Rueschel2015-11-121-0/+3
| | | | | | | | | | | | | The functions str_to_ip() and str_to_ip6() are not yet exposed to plugins so they cannot be used there. Now they are added to the plugin API. Change-Id: I9df267934ad43887a6326c8c9a1a666f263c08a2 Reviewed-on: https://code.wireshark.org/review/11728 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
* Don't include libwireshark headers from libwiretap.Guy Harris2015-11-041-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | Move the definitions of hashipv4_t and hashipv6_t to wiretap/wtap.h, as that's the main place they're used. Change them a bit not to depend on other stuff from libwireshark, and change the code as required by those changes. This should fix the Solaris build; apparently, the Sun^WOracle compiler is generating code for static inline functions even if they're never called, so that libwiretap ends up including code that calls tvbuff and wmem functions. There's probably further cleanup that could be done here, but this should at least fix the build, as well as getting rid of a dependency between two libraries that are at least somewhat independent (libwiretap should *not* depend on libwireshark, as some programs use libwiretap but not libwireshark, and, ultimately, we probably want it to be possible to use libwireshark without libwiretap but that'd be more work). Change-Id: I91c745282f17d7c8bff7809aa277eab2b3cf47c1 Reviewed-on: https://code.wireshark.org/review/11537 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Remove duplicate transport ports from proto tree summaryJoão Valverde2015-10-111-1/+21
| | | | | | | | | | | | | | Don't display duplicate ports if transport name resolution is not enabled (for UDP/TCP/DCCP). Also introduce col_append_port() to handle info column port display with name resolution in a uniform format. Change-Id: Icb8ac45f726b7c539b4534c62061473e9b582753 Reviewed-on: https://code.wireshark.org/review/10804 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
* Add BASE_PT_ field display typesJoão Valverde2015-10-051-1/+8
| | | | | | | | | | | | | | | Avoid displaying duplicate port numbers with transport name resolution disabled and make some dissector code simpler. Introduces port_with_resolution_to_str_buf() function and amends UDP/TCP/DCCP/SCTP to use the new field display type. Change-Id: Ifb97810b9c669ccbb1a310a2c0ffd6e2b63af210 Reviewed-on: https://code.wireshark.org/review/10625 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
* addr_resolv: cosmetic change for flagsPeter Wu2015-09-271-5/+5
| | | | | | | | | | | | Reduce some magic numbers and add parentheses, change ((flags & X) == X) to simply (flags * X), change tp->flags = tp->flags | x to tp->flags |= x. Change-Id: Ida2d1aa59a3efc20d5fe6910d7b757277eb7e627 Reviewed-on: https://code.wireshark.org/review/10659 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
* Don't display duplicate addresses without name resolution enabledJoão Valverde2015-09-251-0/+6
| | | | | | | | Change-Id: Ieb88e2632401cbf50c4ae51768a64df64d54a45d Reviewed-on: https://code.wireshark.org/review/10497 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
* DNS: move DNS name resolution pref to Name Resolution prefsHadriel Kaplan2015-07-251-6/+15
| | | | | | | | | | | | | | | Move the boolean flag for using captured DNS packet info for name resolution to the Name Resolution preferences settings, as it was rather surprising to disable Name Resolution preferences and still have names being resolved. Also disble them all if the '-n' command line switch is used, and re-enable it for a 'd' character in the '-N' option. Bug: 10337 Change-Id: Ie4d47bab0100db3360cc447cd3e446b2e39aa917 Reviewed-on: https://code.wireshark.org/review/9786 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
* Fix address resolution for columns.Guy Harris2015-07-031-14/+0
| | | | | | | | | | | | | | Have address_to_name() be a routine that takes an address and returns a string with a "sufficiently long" lifetime for use in columns, using the address type's addr_name_res_str routine for most address types, rather than having a too-small set of address types wired into it. It replaces both the internal solve_address_to_name() routine and get_addr_name(), and can, for example, handle the special WLAN address types rather than leaving them unresolved even with an ethers file. Change-Id: Id09bc412adf5d2752155650a14a77c5378af2e42 Reviewed-on: https://code.wireshark.org/review/9475 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Add tvb_get_ether_nameMichael Mann2015-03-031-0/+3
| | | | | | | | | | This is mostly to reduce tvb_get_ptr calls that were used to pass into get_ether_name. Some optimizations were made to packet-ieee80211.c in the process of conversion. Change-Id: I81d3c65d4c09a15237fc287c2e989eb6e6936b1f Reviewed-on: https://code.wireshark.org/review/7492 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Make get_manuf_name return a const string.Michael Mann2015-02-161-1/+7
| | | | | | | | | | Model get_manuf_name after get_ether_name so that a string (either name resolved or colon-separated bytes) is always stored in a hash table. This will make name resolution of addresses perform a little better because it doesn't have to worry about the wmem_allocator. Change-Id: If976fe7b0c3f9cd053225096c2ac05418f061af6 Reviewed-on: https://code.wireshark.org/review/7081 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
* "Hide" hashether_t structure.Michael Mann2015-02-141-7/+6
| | | | | | | | One use in a GUI function isn't really enough to justify making the structure public. Change-Id: Ic7dee275ba0a2bd4e19c06702a867417c5624c27 Reviewed-on: https://code.wireshark.org/review/7080 Reviewed-by: Michael Mann <mmann78@netscape.net>
* Revert ""Hide" hashether_t structure."Anders Broman2015-02-121-6/+7
| | | | | | | | This reverts commit 297ef07b9b2f5b681234d0c31269996413262cbc. Change-Id: Id47f5fd221b631c95ca71e3f9315f5263bab22de Reviewed-on: https://code.wireshark.org/review/7077 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Revert "Make get_manuf_name return a const string."Anders Broman2015-02-121-7/+1
| | | | | | | | This reverts commit 797ea88aefc2f45dba7e77d2dcaebe68ac1a4fac. Change-Id: I9bc2cef0051d88c6374c6f1868b0250cba3edbd4 Reviewed-on: https://code.wireshark.org/review/7076 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Make get_manuf_name return a const string.Michael Mann2015-02-121-1/+7
| | | | | | | | | | Model get_manuf_name after get_ether_name so that a string (either name resolved or colon-separated bytes) is always stored in a hash table. This will make name resolution of addresses perform a little better because it doesn't have to work about the wmem_allocator. Change-Id: I80f465ae0845290255a659ab63310ac3cc35506e Reviewed-on: https://code.wireshark.org/review/7075 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* "Hide" hashether_t structure.Michael Mann2015-02-121-7/+6
| | | | | | | | One use in a GUI function isn't really enough to justify making the structure public. Change-Id: I6d70b9bacbc0fa1898150f59c0c69779a6cd5d51 Reviewed-on: https://code.wireshark.org/review/7074 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Miscellaneous ep_strdup_printf replacement.Michael Mann2015-01-181-1/+1
| | | | | | | | Change-Id: I973c672e9d573ad67e9b9fd82a5610aaf8a74efa Reviewed-on: https://code.wireshark.org/review/6605 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
* Replace se alloced memory in compare stat tap.Michael Mann2015-01-161-1/+1
| | | | | | | | | | | Also replaced comments mentioning se_alloc memory with wmem_file_scope, since it's more accurate. It seems that many of the TShark stat taps may be leaking memory, because the hash tables created by the taps don't get a chance to be freed. Somewhat academic since TShark exits shortly after displaying any stats, but a leak none the less. Change-Id: I8ceecbd00d65b3442dc02d720b39c2e15aa0c8a6 Reviewed-on: https://code.wireshark.org/review/6557 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
* Convert EUI64 address APIs to use wmem.Michael Mann2015-01-091-6/+2
| | | | | | | | Change-Id: I57d2e435ac72ea07ec9a567e0b1ce4410966e3d2 Reviewed-on: https://code.wireshark.org/review/6419 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Have ipxnet addresses use wmem scoped memory.Michael Mann2015-01-091-1/+1
| | | | | | | Change-Id: I1d8eed2ceacccce2768590f0689cd2c83a5e56e9 Reviewed-on: https://code.wireshark.org/review/6418 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* ep_<protocol>_port_to_display -> <protocol>_port_to_displayMichael Mann2015-01-081-8/+8
| | | | | | | | Adjust any other ep_ related APIs related to the transition. Change-Id: I961b371c2c4bda557e0f1817705c27eef0dae66c Reviewed-on: https://code.wireshark.org/review/6388 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Replace ep_address_to_str with address_to_str.Michael Mann2015-01-061-1/+1
| | | | | | | | | Change-Id: I4f1078b20f41800f72a751612703ad0d4c2ae87b Reviewed-on: https://code.wireshark.org/review/6323 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Replace ep_display_to_address with wmem equivalent display_to_address.Michael Mann2015-01-051-17/+3
| | | | | | | | Almost all instances require using "manual" memory management, but it gets some ep_ calls out of the GUI. Change-Id: Ifa7303766b08d09442ccf3d7063cbe061578ecd9 Reviewed-on: https://code.wireshark.org/review/6318 Reviewed-by: Michael Mann <mmann78@netscape.net>