osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

MaxMind DB: Shut down our mmdbresolve process. 

Call maxmind_db_pref_cleanup from prefs_cleanup.

Change-Id: I0c48e1015a38ab198beea168e12b646336ffe115
Reviewed-on: https://code.wireshark.org/review/26485
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2018-03-15 09:44:58 -07:00
parent be1af00448
commit 5f58d96717
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/maxmind_db.h
View File

@ -33,12 +33,12 @@ typedef struct _mmdb_lookup_t {
} mmdb_lookup_t; } mmdb_lookup_t;
/** /**
* Init function called from epan.h * Init / reset function called from prefs_reset
*/ */
WS_DLL_LOCAL void maxmind_db_pref_init(module_t *nameres); WS_DLL_LOCAL void maxmind_db_pref_init(module_t *nameres);
/** /**
* Cleanup function called from epan.h * Cleanup function called from prefs_cleanup
*/ */
WS_DLL_LOCAL void maxmind_db_pref_cleanup(void); WS_DLL_LOCAL void maxmind_db_pref_cleanup(void);

3
epan/prefs.c
View File

@ -401,6 +401,9 @@ prefs_cleanup(void)
/* Clean the uats */ /* Clean the uats */
uat_cleanup(); uat_cleanup();
/* Shut down mmdbresolve */
maxmind_db_pref_cleanup();
g_free(prefs.saved_at_version); g_free(prefs.saved_at_version);
g_free(gpf_path); g_free(gpf_path);
gpf_path = NULL; gpf_path = NULL;