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

- remove no longer used #defines 

- prefs.name_resolve_concurrency is now just 'name_resolve_concurrency'
- add notes about possible (?) integer overflows.

svn path=/trunk/; revision=43586
This commit is contained in:
Jakub Zawadzki 2012-07-06 07:55:58 +00:00
parent 47cee41290
commit 88cb14dda3
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/addr_resolv.c
View File

@ -732,6 +732,7 @@ c_ares_ghba_cb(void *arg, int status, int timeouts _U_, struct hostent *he) {
char **p;
if (!caqm) return;
/* XXX, what to do if async_dns_in_flight == 0? */
async_dns_in_flight--;
if (status == ARES_SUCCESS) {
@ -2599,7 +2600,7 @@ host_name_lookup_process(gpointer data _U_) {
async_dns_queue_head = g_list_first(async_dns_queue_head);
cur = async_dns_queue_head;
while (cur && async_dns_in_flight <= prefs.name_resolve_concurrency) {
while (cur && async_dns_in_flight <= name_resolve_concurrency) {
almsg = (async_dns_queue_msg_t *) cur->data;
if (! almsg->submitted && almsg->type == AF_INET) {
addr_bytes = (guint8 *) &almsg->ip4_addr;
@ -2630,6 +2631,7 @@ host_name_lookup_process(gpointer data _U_) {
if (dequeue) {
async_dns_queue_head = g_list_remove(async_dns_queue_head, (void *) almsg);
g_free(almsg);
/* XXX, what to do if async_dns_in_flight == 0? */
async_dns_in_flight--;
}
}

5
epan/prefs.c
View File

@ -2186,11 +2186,6 @@ prefs_capture_device_monitor_mode(const char *name)
* It's not a preference for a particular part of Wireshark, it's used all
* over the place, so its name doesn't have two components.
*/
#define PRS_NAME_RESOLVE "name_resolve"
#define PRS_NAME_RESOLVE_CONCURRENCY "name_resolve_concurrency"
#define PRS_NAME_RESOLVE_LOAD_SMI_MODULES "name_resolve_load_smi_modules"
#define PRS_NAME_RESOLVE_SUPPRESS_SMI_ERRORS "name_resolve_suppress_smi_errors"
#define PRS_CAP_NAME_RESOLVE "capture.name_resolve"
/* values for the capture dialog box */
#define PRS_CAP_DEVICE "capture.device"