osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Detangle the #ifdefs a bit. 

svn path=/trunk/; revision=54748
This commit is contained in:
Guy Harris 2014-01-14 01:40:09 +00:00
parent 2e5c54935b
commit afef2cd8f4
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
capture-pcap-util-unix.c
View File

@ -28,7 +28,11 @@
#ifdef HAVE_LIBPCAP
#ifndef HAVE_PCAP_FINDALLDEVS
#ifdef HAVE_PCAP_FINDALLDEVS
#include <pcap.h>
#else /* HAVE_PCAP_FINDALLDEVS */
#include <stdlib.h>
#include <string.h>
@ -60,25 +64,11 @@ struct rtentry;
#include "capture-pcap-util.h"
#else
#include <pcap.h>
#endif /* HAVE_PCAP_FINDALLDEVS */
#include "capture_ifinfo.h"
#include "capture-pcap-util-int.h"
#ifndef HAVE_PCAP_FINDALLDEVS
struct search_user_data {
char *name;
if_info_t *if_info;
};
static void
search_for_if_cb(gpointer data, gpointer user_data);
#endif
#ifdef HAVE_PCAP_REMOTE
GList *
get_remote_interface_list(const char *hostname, const char *port,
@ -110,12 +100,31 @@ get_remote_interface_list(const char *hostname, const char *port,
}
#endif
#ifdef HAVE_PCAP_FINDALLDEVS
GList *
get_interface_list(int *err, char **err_str)
{
#ifdef HAVE_PCAP_FINDALLDEVS
return get_interface_list_findalldevs(err, err_str);
#else
}
#else /* HAVE_PCAP_FINDALLDEVS */
struct search_user_data {
char *name;
if_info_t *if_info;
};
static void
search_for_if_cb(gpointer data, gpointer user_data)
{
struct search_user_data *search_user_data = user_data;
if_info_t *if_info = data;
if (strcmp(if_info->name, search_user_data->name) == 0)
search_user_data->if_info = if_info;
}
GList *
get_interface_list(int *err, char **err_str)
{
GList *il = NULL;
gint nonloopback_pos = 0;
struct ifreq *ifr, *last;
@ -309,18 +318,6 @@ fail:
close(sock);
*err = CANT_GET_INTERFACE_LIST;
return NULL;
#endif /* HAVE_PCAP_FINDALLDEVS */
}
#ifndef HAVE_PCAP_FINDALLDEVS
static void
search_for_if_cb(gpointer data, gpointer user_data)
{
struct search_user_data *search_user_data = user_data;
if_info_t *if_info = data;
if (strcmp(if_info->name, search_user_data->name) == 0)
search_user_data->if_info = if_info;
}
#endif /* HAVE_PCAP_FINDALLDEVS */