aboutsummaryrefslogtreecommitdiffstats
path: root/epan/addr_resolv.c
AgeCommit message (Collapse)AuthorFilesLines
2018-11-23addr_resolv: fix crashes in parse_ether_address_fastPeter Wu1-10/+11
When no mask is allowed, reject addresses like "aa:bb:cc:...". Fix the type of 'cp' to avoid reading from a negative array index. Fix parsing, a nibble is four bits, not eight. Bug: 15297 Change-Id: Ibb0d0c17005b1e6213c09092e4b3c888a9024304 Fixes: v2.9.0rc0-2629-g3bb32ede26 ("addr_resolv: add fast path for parsing addresses from manuf") Reviewed-on: https://code.wireshark.org/review/30768 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-22addr_resolv: add fast path for parsing addresses from manufPeter Wu1-2/+100
The manuf file is large but has a consistent format (25.7k entries with three octets, 9.8k entries with a mask). Add a fast path for this file that is 20% faster (saves 20ms on an unoptimized Debug+ASAN build). Change-Id: Ida509b0305caf4e26131dc5cf5fb04c49392ad4b Reviewed-on: https://code.wireshark.org/review/30757 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-22addr_resolv: avoid unnecessary memory allocation for hash tablesPeter Wu1-40/+25
The key for the manuf table is 24 bits of the ether addr while the key for services table needs is a 16 bit port. Store this value directly, saving some memory and improving startup time by a tiny bit. Likewise for ipxnet_hash_table and vlan_hash_table. These tables seem unused though, perhaps it should be removed. Change-Id: Ide9ffad8e2c9af24afa82adb2e009f32a5f43d38 Reviewed-on: https://code.wireshark.org/review/30756 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-11-22addr_resolv: speed up reading manuf, services, etc.Peter Wu1-63/+25
An unoptimized, Debug+ASAN `tshark --version` takes about 1 second. 17% of the cycles are spent in addr_resolv_init and 7% within fgetline. Use fgets instead, now fgetline only costs ~0.5% (11% for addr_resolv_init). This limits the line length to 1K which should more than be sufficient for all involved files (longest lines: manuf 154, services 222). Change-Id: I8fe4dff317beaa2926c4106909b10898bcd35f21 Reviewed-on: https://code.wireshark.org/review/30755 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-10-15addr_resolv: function to convert an eth address into raw bytesMartin Kaiser1-1/+19
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>
2018-09-03make IPv4 and IPv6 name resolution usable at all timesMartin Kaiser1-6/+11
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>
2018-06-01Remove tabs around manuf names as shown for BASE_OUIAdrian Granados1-5/+2
And handle comments in manuf file entries correctly. There are entries in the manuf file where columns are separated by two or more tab characters. These extra tab characters are not being trimmed from the manuf name. OUI: 00:40:96 ( Cisco Systems, Inc.) -> OUI: 00:40:96 (Cisco Systems, Inc.) Change-Id: Ie6545480848bb84c20bea6566a3ccf11c7ed9233 Reviewed-on: https://code.wireshark.org/review/27759 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-23Do IP address resolution synchronously before printing in TShark.Guy Harris1-17/+206
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>
2018-05-20Get rid of add_async_dns_ipv4().Guy Harris1-13/+7
We don't have add_async_dns_ipv6(), we just do the same stuff inline in host_lookup6(); this removes an irrelevant difference between host_lookup() and host_lookup6(). Change-Id: Ib4aa1783ddec1bc390e2a7f64c87f1c8441fa849 Reviewed-on: https://code.wireshark.org/review/27661 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-20Make private variables static.Guy Harris1-2/+2
Change-Id: I0844795597cec83dfb6752fb986d2a9957789530 Reviewed-on: https://code.wireshark.org/review/27657 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-25addr_resolv: fix memleak of g_penterprises_pathPeter Wu1-4/+4
Found by valgrind. Remove unnecessary "if" guard for g_free while at it. Change-Id: I58a18472f2c82e4c6c810d3cb3eeb2358b64f4ab Reviewed-on: https://code.wireshark.org/review/27133 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-06Transition from GeoIP Legacy to MaxMindDB.Gerald Combs1-3/+7
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>
2018-03-03Don't crash in manually_resolve_cleanup() if there's nothing to clean up.Guy Harris1-4/+8
We might not yet have allocated the manually-resolved address lists; only free the if we have. Change-Id: Iff9864e397a04cdcb613268603c073ecd1fa77fb Reviewed-on: https://code.wireshark.org/review/26236 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-08epan: use SPDX indentifiers.Dario Lombardo1-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>
2017-10-29Get rid of MAX_IP_STR_LEN and MAX_IP6_STR_LEN.Guy Harris1-2/+2
We have WS_INET_ADDRSTRLEN and WS_INET6_ADDRSTRLEN; use them. Change-Id: Idade0da9fae70d891901acd787b06d21e2ddbc5f Reviewed-on: https://code.wireshark.org/review/24156 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-26Add a ws_in6_addr typedef for struct e_in6_addr.Guy Harris1-17/+17
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>
2017-10-26CMake: Don't check for windows.h or winsock2.h.Gerald Combs1-5/+2
If we're building on Windows we're going to have windows.h and winsock2.h. Don't bother checking for them. Change-Id: I0004c44d7364ab3f41682f34b8c84cd8617c9603 Reviewed-on: https://code.wireshark.org/review/24068 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-25We're using inet_pton(), so we don't need to worry about non-dotted-quad ↵Guy Harris1-14/+0
addresses. inet_pton(), and thus ws_inet_pton(), won't accept hex or fewer-than-four-component IPv4 addresses, at least on Single UNIX Specification-compliant systems - the SUSv4 explicitly says The inet_pton() function does not accept other formats (such as the octal numbers, hexadecimal numbers, and fewer than four numbers that inet_addr() accepts). so we don't need to check for "inet_atons that accept strings such as - "130.230" as valid addresses". That also means that, "if there are any places where this needs to support the hex-address form for IPv4 addresses, or to support fewer than 4 components for a network address", those places were hosed even before we stopped using inet_aton(), so there are presumably no such places. (Itojun's comment was probably just an expression of general concern, rather than a note of a known problem.) Change-Id: Id16b6ebd3550dc3bf5a0fc283898a99b7abc163c Reviewed-on: https://code.wireshark.org/review/24057 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-25Get rid of a no-longer-needed variable.Guy Harris1-3/+1
We don't need a temporary IPv4 address variable in get_host_ipaddr(), we can just use the pointer we've been handed. Change-Id: Id7cbd0c14b2eeb3efde5a556f3414bd635411908 Reviewed-on: https://code.wireshark.org/review/24056 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-25Clean up and expand comments.Guy Harris1-6/+19
Note the dropping of support for hex IPv4 addresses and addresses with fewer than four components, and indicate that, if there are any places where that support is expected, we should change those places (i.e., don't just change get_host_ipaddr() and, if there aren't any such places, just leave everything as it is). It's not clear that get_host_ipaddr() is "Used more in the dfilter parser rather than in packet dissectors"; that may depend on whether you're counting number of calls executed from those places or the number of lines of code making those calls. Just drop the claim, which is absent in the comment for get_host_ipaddr6(). Also ask whether we're using get_host_ipaddr{6}() in any places where it should *only* support numeric addresses rather than names. Change-Id: Ib5d8730ca703339342f308081a68309479f842c5 Reviewed-on: https://code.wireshark.org/review/24055 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-25Remove inet_aton() usage everywhereJoão Valverde1-9/+3
Including where it says not to in comments. Use IPv4 dotted-decimal notation. Change-Id: Iafe1f6fbd2bd5867c41642dc27411f47dff8ce6a Reviewed-on: https://code.wireshark.org/review/24044 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-09-02manuf.tmpl: mark commentsJoão Valverde1-6/+11
Comments were discarded based on a fourth column using tab separators. Use a pound sign instead. Change-Id: Icb5dd33c4a2c9c441eebda74bc8d813443efe1b6 Reviewed-on: https://code.wireshark.org/review/23351 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: João Valverde <j@v6e.pt>
2017-09-01Fix comment in addr_resolv.cJoão Valverde1-2/+2
Fixes g55724db3db. Change-Id: Idf9d5293fcd0e91698305da1cec5b8771c0a6a91 Reviewed-on: https://code.wireshark.org/review/23345 Reviewed-by: João Valverde <j@v6e.pt>
2017-08-24Extract the "long name" out of the manuf file and use it for some resolutionMichael Mann1-20/+30
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>
2017-08-08We really only need one range_foreach routine.Guy Harris1-1/+1
Rename range_foreach_r() to range_foreach(), getting rid of the old range_foreach(). If your callback doesn't require an additional argument, just pass NULL when calling range_foreach(), and declare the argument as unused. Change-Id: I49a56f90610e39cf2ddc398c9e30ed11a6ca90db Reviewed-on: https://code.wireshark.org/review/23025 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07Rename reentrant range_foreach2 to range_foreach_rAhmad Fatoum1-1/+1
to avoid mistaking it for a range function that operates on pairs. Change-Id: If9117c195ba21d55a476c3b9deb2a2ca7a1056ed Reviewed-on: https://code.wireshark.org/review/22994 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>
2017-08-04Optimize the "services" dictionaryJoão Valverde1-41/+31
Remove assignee and other miscellaneous information that changes more frequently than service name and can be consulted directly in the IANA registry. Allow merging identical transports into a single line for convenience and size/speed optimization (a backward-compatible change). Remove obsolete make-services.pl. Change-Id: I3ecbd1a6a68d87c084d77498a0eeb44b7afdab67 Reviewed-on: https://code.wireshark.org/review/22872 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-23Put the well-known addresses into a separate file from OUIsJoão Valverde1-24/+36
Having two distinct logical concepts (OUI and Well Known Address) concatenated to a single "manuf" file is needlessly obfuscating the WKA feature. Have a distinct "wka" file instead and just skip the cat. Change-Id: I46f53b0015a37331d65f8cfac7cbbd499dd0c5b8 Reviewed-on: https://code.wireshark.org/review/22742 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-21Require c-ares >= 1.5João Valverde1-31/+2
Version 1.5 was released on 21-nov-2007. RHEL, Suse, etc supported versions are all above c-ares v1.5. We don't bother testing for it at build time for now, because it's non-trivial (times two build systems). Change-Id: I9253256d8d905da0c75d80b2b0fa4527df2b1420 Reviewed-on: https://code.wireshark.org/review/22741 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-20Remove dead code for address reverse-mappingJoão Valverde1-184/+2
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>
2017-07-18Extend enterprises.tsv to accept spaces as separatorsJoão Valverde1-14/+7
We can do so easily because the format is so simple. This makes it more convenient for a user to hand-edit a dictionary in the personal config folder. We still use tabs in the system file for a small space gain. Also add a brief description of the format as a comment. Change-Id: If3f741bff16f1f42c8ef07d643dc6463caaad1a5 Reviewed-on: https://code.wireshark.org/review/22678 Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-15Rename enterprises to enterprises.tsv and ship it.Gerald Combs1-1/+1
Rename "enterprises" to "enterprises.tsv" so that its format is a bit more obvious and so that double-clicking the file might do something useful. Add it to the Windows packages. Change-Id: I5ef54a04ce1b4926aa4535e756e04b3e2a56d463 Reviewed-on: https://code.wireshark.org/review/22616 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-03Replace and remove enterprises_lookup_format()João Valverde1-13/+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>
2017-06-26Parse enterprise-numbers at run timeJoão Valverde1-0/+128
"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>
2017-06-19Attempt to clean up addr_resolv flags by removing DUMMY_ADDRESS_ENTRYAnthony Coddington1-20/+10
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>
2017-06-13Fix automatic name resolution not saved to NRBAnthony Coddington1-0/+4
Clear DUMMY_ADDRESS_ENTRY when add_ipv4_name/add_ipv6_name. This flag is checked in ipv4_hash_table_resolved_to_list(). TODO: clean up these flags as they are confusing and DUMMY appears somewhat redundant. Change-Id: I81d40cc778cbe5c36314631d3fa0997cee409368 Bug: 13798 Reviewed-on: https://code.wireshark.org/review/22109 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-15Fix memleak of g_pservices_path.Jakub Zawadzki1-0/+1
Change-Id: Iaee6f3773bc3b4164935092f2c9c9c888171a5b7 Reviewed-on: https://code.wireshark.org/review/21117 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2017-04-08Clean up handling of enabled/disabled protocols/heuristic dissectors.Guy Harris1-1/+1
Add a "report a warning message" routine to the "report_err" code in libwsutil, and rename files and routines appropriately, as they don't only handle errors any more. Have a routine read_enabled_and_disabled_protos() that reads all the files that enable or disable protocols or heuristic dissectors, enables and disables them based on the contents of those files, and reports errors itself (as warnings) using the new "report a warning message" routine. Fix that error reporting to report separately on the disabled protocols, enabled protocols, and heuristic dissectors files. Have a routine to set up the enabled and disabled protocols and heuristic dissectors from the command-line arguments, so it's done the same way in all programs. If we try to enable or disable an unknown heuristic dissector via a command-line argument, report an error. Update a bunch of comments. Update the name of disabled_protos_cleanup(), as it cleans up information for disabled *and* enabled protocols and for heuristic dissectors. Support the command-line flags to enable and disable protocols and heuristic dissectors in tfshark. Change-Id: I9b8bd29947cccdf6dc34a0540b5509ef941391df Reviewed-on: https://code.wireshark.org/review/20966 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05A bunch of "{Mac} OS X" -> "macOS" changes.Guy Harris1-1/+1
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-03Check profile directory before personal directory for services and subnets fileMichael Mann1-7/+26
Bug: 11228 Change-Id: Id8bcc51ff694ef9f2019bc7509e440021d049d22 Reviewed-on: https://code.wireshark.org/review/19735 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: Peter Wu <peter@lekensteyn.nl>
2017-02-18epan/wsutil: free memory on exit.Dario Lombardo1-0/+14
Change-Id: I1cf3a4ce3b21b2e10887cbef5576e5e028e55bab Reviewed-on: https://code.wireshark.org/review/20052 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-08addr_resolv: remove leak.Dario Lombardo1-0/+2
Change-Id: If4676b2982efae593084dbe951d8e0bb97189917 Reviewed-on: https://code.wireshark.org/review/19966 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-01-07Convert range API to always use wmem memory.Michael Mann1-2/+3
This is mostly to address memory leaks in range preferences (the biggest user of range functionality) on shutdown. Now range preferences must use epan scoped memory when referencing internal preference structures to keep consistency. Change-Id: Idc644f59b5b42fa1d46891542b53ff13ea754157 Reviewed-on: https://code.wireshark.org/review/19387 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-22Improve name resolution preference tooltips.Jaap Keuter1-15/+12
Change the tooltips texts to make them better describe the preference. Bug: 13130 Bug: 13131 Change-Id: Ie753e3703a702bdafed91cf0f41b306347088526 Reviewed-on: https://code.wireshark.org/review/18878 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-16Resolv: various code / comment cleanupsJaap Keuter1-53/+39
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>
2016-11-12Really return manufacturer name if it's known.Jaap Keuter1-2/+2
Bug: 13126 Change-Id: I56e935cea7aa323941ac612d4954875a01910684 Reviewed-on: https://code.wireshark.org/review/18752 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-20Put the SS7 PC name resolution feature in the release notes.Jeff Morriss1-1/+1
Fix the casing of the preference while at it (it now matches other name resolution preferences). Change-Id: Ibfecbc94f9eccefa7d3b1a50ae2598dfefb707a2 Reviewed-on: https://code.wireshark.org/review/18330 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-16addr_resolv(.c): no previous prototype for ↵Alexis La Goutte1-2/+2
‘add_ss7pc_name/ss7pc_name_lookup_init’ [-Wmissing-prototypes] Change-Id: Ice8c901e41e1881210c0f4bf70851810ca480e81 Reviewed-on: https://code.wireshark.org/review/18222 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-12MTP3: Added SS7 Point Code Name ResolutionBinh Trinh1-1/+169
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>
2016-09-13addr_resolv: use ws_strtou8 function.Dario Lombardo1-6/+7
This change prevents to accept netmasks as /24x. The mask must be an clean integer. Change-Id: I46aeb089dd6538b5cc4bde7efd4dc317621a5245 Reviewed-on: https://code.wireshark.org/review/17612 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 07:43:34 +0000