diff options
author | Irene RĂ¼ngeler <I.Ruengeler@fh-muenster.de> | 2013-03-13 12:38:08 +0000 |
---|---|---|
committer | Irene RĂ¼ngeler <I.Ruengeler@fh-muenster.de> | 2013-03-13 12:38:08 +0000 |
commit | 44e6a88b134b0b35ea6c7d76dd76647f357b86c0 (patch) | |
tree | 1116fe96aa640a09d11e2b82901c030a1e410e62 /ui/iface_lists.c | |
parent | 27fc641a791f6132f13521697ea4c3dc47f8bc7e (diff) |
Add interface options preferences.
svn path=/trunk/; revision=48275
Diffstat (limited to 'ui/iface_lists.c')
-rw-r--r-- | ui/iface_lists.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/ui/iface_lists.c b/ui/iface_lists.c index b0537d251d..7fbdf7e8ec 100644 --- a/ui/iface_lists.c +++ b/ui/iface_lists.c @@ -242,12 +242,22 @@ scan_local_interfaces(void) device.local = TRUE; device.if_info = *temp; device.last_packets = 0; - device.pmode = global_capture_opts.default_options.promisc_mode; - device.has_snaplen = global_capture_opts.default_options.has_snaplen; - device.snaplen = global_capture_opts.default_options.snaplen; + if ((device.pmode = capture_dev_user_pmode_find(if_info->name)) == -1) { + device.pmode = global_capture_opts.default_options.promisc_mode; + } + if ((device.has_snaplen = capture_dev_user_hassnap_find(if_info->name)) == -1) { + device.has_snaplen = global_capture_opts.default_options.has_snaplen; + } + if (capture_dev_user_snaplen_find(if_info->name) == -1) { + device.snaplen = global_capture_opts.default_options.snaplen; + } else { + device.snaplen = (guint)capture_dev_user_snaplen_find(if_info->name); + } device.cfilter = g_strdup(global_capture_opts.default_options.cfilter); #if defined(_WIN32) || defined(HAVE_PCAP_CREATE) - device.buffer = DEFAULT_CAPTURE_BUFFER_SIZE; + if ((device.buffer = capture_dev_user_buffersize_find(if_info->name)) == -1) { + device.buffer = global_capture_opts.default_options.buffer_size; + } #endif if (global_capture_opts.ifaces->len > 0) { |