diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2011-09-24 16:24:09 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2011-09-24 16:24:09 +0000 |
| commit | 92752916adb83a14ef65752d6c7a44ebfebc4310 (patch) | |
| tree | 650f83f7be3c9d826de87f3a10429e63e2528025 /airpcap_loader.c | |
| parent | 6d46e5d01bc9ea7397412faa03814cd198afe6c7 (diff) | |
Don't consider remote airpcap devices as airpcap devices, but as remote devices.
This makes the GUI consistent.
svn path=/trunk/; revision=39123
Diffstat (limited to 'airpcap_loader.c')
| -rw-r--r-- | airpcap_loader.c | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/airpcap_loader.c b/airpcap_loader.c index b41f51b86b..c6fac9b3fe 100644 --- a/airpcap_loader.c +++ b/airpcap_loader.c @@ -1453,35 +1453,16 @@ get_airpcap_interface_list(int *err, char **err_str) */ airpcap_if_info_t* get_airpcap_if_from_name(GList* if_list, const gchar* name) { - unsigned int ifn; - GList* curr; - airpcap_if_info_t* if_info; + GList* curr; + airpcap_if_info_t* if_info; - ifn = 0; - if(if_list != NULL) - { - while( ifn < g_list_length(if_list) ) - { - curr = g_list_nth(if_list, ifn); - - if_info = NULL; - if(curr != NULL) - if_info = curr->data; - if(if_info != NULL) - { - if ( g_ascii_strcasecmp(if_info->name,name) == 0 -#ifdef HAVE_PCAP_REMOTE /* The interface will be prepended with "rpcap://" */ - || g_str_has_suffix(name, if_info->name) -#endif - ) - { - return if_info; + for (curr = g_list_first(if_list); curr; curr = g_list_next(curr)) { + if_info = (airpcap_if_info_t *)curr->data; + if (if_info && (g_ascii_strcasecmp(if_info->name, name) == 0) { + return (if_info); } - } - ifn++; } - } - return NULL; + return (NULL); } /* |