X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=capture-pcap-util.c;h=3b1ebbf8f9157e914253d8680ca562ead9fbf45b;hp=f143a9586cb89e27f47bed9bf11aa28c3feb32ee;hb=71cb65cebcffe5409d90fa6cfae122c3bd3dd49a;hpb=70ec67e5d4f0d92c1ecaa44af873fa09aa9f1f2e;ds=sidebyside diff --git a/capture-pcap-util.c b/capture-pcap-util.c index f143a9586c..3b1ebbf8f9 100644 --- a/capture-pcap-util.c +++ b/capture-pcap-util.c @@ -35,8 +35,6 @@ #include #include -#include - #ifdef HAVE_SYS_TYPES_H # include #endif @@ -48,6 +46,7 @@ #include #include +#include "capture_ifinfo.h" #include "capture-pcap-util.h" #include "capture-pcap-util-int.h" @@ -55,142 +54,18 @@ #include #endif - -/* - * Get the data-link type for a libpcap device. - * This works around AIX 5.x's non-standard and incompatible-with-the- - * rest-of-the-universe libpcap. - */ -int -get_pcap_linktype(pcap_t *pch, const char *devname -#ifndef _AIX - _U_ -#endif -) -{ - int linktype; -#ifdef _AIX - const char *ifacename; -#endif - - linktype = pcap_datalink(pch); -#ifdef _AIX - - /* - * The libpcap that comes with AIX 5.x uses RFC 1573 ifType values - * rather than DLT_ values for link-layer types; the ifType values - * for LAN devices are: - * - * Ethernet 6 - * 802.3 7 - * Token Ring 9 - * FDDI 15 - * - * and the ifType value for a loopback device is 24. - * - * The AIX names for LAN devices begin with: - * - * Ethernet en - * 802.3 et - * Token Ring tr - * FDDI fi - * - * and the AIX names for loopback devices begin with "lo". - * - * (The difference between "Ethernet" and "802.3" is presumably - * whether packets have an Ethernet header, with a packet type, - * or an 802.3 header, with a packet length, followed by an 802.2 - * header and possibly a SNAP header.) - * - * If the device name matches "linktype" interpreted as an ifType - * value, rather than as a DLT_ value, we will assume this is AIX's - * non-standard, incompatible libpcap, rather than a standard libpcap, - * and will map the link-layer type to the standard DLT_ value for - * that link-layer type, as that's what the rest of Wireshark expects. - * - * (This means the capture files won't be readable by a tcpdump - * linked with AIX's non-standard libpcap, but so it goes. They - * *will* be readable by standard versions of tcpdump, Wireshark, - * and so on.) - * - * XXX - if we conclude we're using AIX libpcap, should we also - * set a flag to cause us to assume the time stamps are in - * seconds-and-nanoseconds form, and to convert them to - * seconds-and-microseconds form before processing them and - * writing them out? - */ - - /* - * Find the last component of the device name, which is the - * interface name. - */ - ifacename = strchr(devname, '/'); - if (ifacename == NULL) - ifacename = devname; - - /* See if it matches any of the LAN device names. */ - if (strncmp(ifacename, "en", 2) == 0) { - if (linktype == 6) { - /* - * That's the RFC 1573 value for Ethernet; map it - * to DLT_EN10MB. - */ - linktype = 1; - } - } else if (strncmp(ifacename, "et", 2) == 0) { - if (linktype == 7) { - /* - * That's the RFC 1573 value for 802.3; map it to - * DLT_EN10MB. - * (libpcap, tcpdump, Wireshark, etc. don't care if - * it's Ethernet or 802.3.) - */ - linktype = 1; - } - } else if (strncmp(ifacename, "tr", 2) == 0) { - if (linktype == 9) { - /* - * That's the RFC 1573 value for 802.5 (Token Ring); - * map it to DLT_IEEE802, which is what's used for - * Token Ring. - */ - linktype = 6; - } - } else if (strncmp(ifacename, "fi", 2) == 0) { - if (linktype == 15) { - /* - * That's the RFC 1573 value for FDDI; map it to - * DLT_FDDI. - */ - linktype = 10; - } - } else if (strncmp(ifacename, "lo", 2) == 0) { - if (linktype == 24) { - /* - * That's the RFC 1573 value for "software loopback" - * devices; map it to DLT_NULL, which is what's used - * for loopback devices on BSD. - */ - linktype = 0; - } - } -#endif - - return linktype; -} - if_info_t * if_info_new(char *name, char *description) { if_info_t *if_info; - if_info = g_malloc(sizeof (if_info_t)); + if_info = (if_info_t *)g_malloc(sizeof (if_info_t)); if_info->name = g_strdup(name); if (description == NULL) if_info->description = NULL; else if_info->description = g_strdup(description); - if_info->ip_addr = NULL; + if_info->addrs = NULL; if_info->loopback = FALSE; return if_info; } @@ -198,7 +73,7 @@ if_info_new(char *name, char *description) void if_info_add_address(if_info_t *if_info, struct sockaddr *addr) { - if_addr_t *ip_addr; + if_addr_t *if_addr; struct sockaddr_in *ai; #ifdef INET6 struct sockaddr_in6 *ai6; @@ -207,23 +82,23 @@ if_info_add_address(if_info_t *if_info, struct sockaddr *addr) switch (addr->sa_family) { case AF_INET: - ai = (struct sockaddr_in *)addr; - ip_addr = g_malloc(sizeof(*ip_addr)); - ip_addr->type = AT_IPv4; - ip_addr->ip_addr.ip4_addr = + ai = (struct sockaddr_in *)(void *)addr; + if_addr = (if_addr_t *)g_malloc(sizeof(*if_addr)); + if_addr->ifat_type = IF_AT_IPv4; + if_addr->addr.ip4_addr = *((guint32 *)&(ai->sin_addr.s_addr)); - if_info->ip_addr = g_slist_append(if_info->ip_addr, ip_addr); + if_info->addrs = g_slist_append(if_info->addrs, if_addr); break; #ifdef INET6 case AF_INET6: - ai6 = (struct sockaddr_in6 *)addr; - ip_addr = g_malloc(sizeof(*ip_addr)); - ip_addr->type = AT_IPv6; - memcpy((void *)&ip_addr->ip_addr.ip6_addr, + ai6 = (struct sockaddr_in6 *)(void *)addr; + if_addr = (if_addr_t *)g_malloc(sizeof(*if_addr)); + if_addr->ifat_type = IF_AT_IPv6; + memcpy((void *)&if_addr->addr.ip6_addr, (void *)&ai6->sin6_addr.s6_addr, - sizeof ip_addr->ip_addr.ip6_addr); - if_info->ip_addr = g_slist_append(if_info->ip_addr, ip_addr); + sizeof if_addr->addr.ip6_addr); + if_info->addrs = g_slist_append(if_info->addrs, if_addr); break; #endif } @@ -333,13 +208,13 @@ free_if_info_addr_cb(gpointer addr, gpointer user_data _U_) static void free_if_cb(gpointer data, gpointer user_data _U_) { - if_info_t *if_info = data; + if_info_t *if_info = (if_info_t *)data; g_free(if_info->name); g_free(if_info->description); - g_slist_foreach(if_info->ip_addr, free_if_info_addr_cb, NULL); - g_slist_free(if_info->ip_addr); + g_slist_foreach(if_info->addrs, free_if_info_addr_cb, NULL); + g_slist_free(if_info->addrs); g_free(if_info); } @@ -439,144 +314,21 @@ pcap_datalink_val_to_description(int dlt) #endif /* !defined(HAVE_PCAP_DATALINK_VAL_TO_NAME) || !defined(HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION) */ -/* - * Get the data-link types available for a libpcap device. - */ -static data_link_info_t * -create_data_link_info(int dlt) -{ - data_link_info_t *data_link_info; - const char *text; - - data_link_info = g_malloc(sizeof (data_link_info_t)); - data_link_info->dlt = dlt; - text = pcap_datalink_val_to_name(dlt); - if (text != NULL) - data_link_info->name = g_strdup(text); - else - data_link_info->name = g_strdup_printf("DLT %d", dlt); - text = pcap_datalink_val_to_description(dlt); - if (text != NULL) - data_link_info->description = g_strdup(text); - else - data_link_info->description = NULL; - return data_link_info; -} - -GList * -get_pcap_linktype_list(const char *devname, char **err_str) -{ - GList *linktype_list = NULL; - pcap_t *pch; - int deflt; - char errbuf[PCAP_ERRBUF_SIZE]; -#ifdef HAVE_PCAP_LIST_DATALINKS - int *linktypes; - int i, nlt; -#endif - data_link_info_t *data_link_info; - -#ifdef HAVE_PCAP_OPEN - pch = pcap_open(devname, MIN_PACKET_SIZE, 0, 0, NULL, errbuf); -#else - pch = pcap_open_live(devname, MIN_PACKET_SIZE, 0, 0, errbuf); -#endif - if (pch == NULL) { - if (err_str != NULL) - *err_str = g_strdup(errbuf); - return NULL; - } - deflt = get_pcap_linktype(pch, devname); -#ifdef HAVE_PCAP_LIST_DATALINKS - nlt = pcap_list_datalinks(pch, &linktypes); - if (nlt == 0 || linktypes == NULL) { - pcap_close(pch); - if (err_str != NULL) - *err_str = NULL; /* an empty list doesn't mean an error */ - return NULL; - } - for (i = 0; i < nlt; i++) { - data_link_info = create_data_link_info(linktypes[i]); - - /* - * XXX - for 802.11, make the most detailed 802.11 - * version the default, rather than the one the - * device has as the default? - */ - if (linktypes[i] == deflt) - linktype_list = g_list_prepend(linktype_list, - data_link_info); - else - linktype_list = g_list_append(linktype_list, - data_link_info); - } -#ifdef HAVE_PCAP_FREE_DATALINKS - pcap_free_datalinks(linktypes); -#else - /* - * In Windows, there's no guarantee that if you have a library - * built with one version of the MSVC++ run-time library, and - * it returns a pointer to allocated data, you can free that - * data from a program linked with another version of the - * MSVC++ run-time library. - * - * This is not an issue on UN*X. - * - * See the mail threads starting at - * - * http://www.winpcap.org/pipermail/winpcap-users/2006-September/001421.html - * - * and - * - * http://www.winpcap.org/pipermail/winpcap-users/2008-May/002498.html - */ -#ifndef _WIN32 - free(linktypes); -#endif /* _WIN32 */ -#endif /* HAVE_PCAP_FREE_DATALINKS */ -#else /* HAVE_PCAP_LIST_DATALINKS */ - data_link_info = create_data_link_info(deflt); - linktype_list = g_list_append(linktype_list, data_link_info); -#endif /* HAVE_PCAP_LIST_DATALINKS */ - - pcap_close(pch); - return linktype_list; -} - static void free_linktype_cb(gpointer data, gpointer user_data _U_) { - data_link_info_t *linktype_info = data; + data_link_info_t *linktype_info = (data_link_info_t *)data; g_free(linktype_info->name); g_free(linktype_info->description); } void -free_pcap_linktype_list(GList *linktype_list) +free_if_capabilities(if_capabilities_t *caps) { - g_list_foreach(linktype_list, free_linktype_cb, NULL); - g_list_free(linktype_list); -} - -/* Set the data link type on a pcap. */ -const char * -set_pcap_linktype(pcap_t *pch, char *devname -#ifdef HAVE_PCAP_SET_DATALINK - _U_ -#endif - , int dlt) -{ -#ifdef HAVE_PCAP_SET_DATALINK - if (pcap_set_datalink(pch, dlt) == 0) - return NULL; /* no error */ - return pcap_geterr(pch); -#else - /* Let them set it to the type it is; reject any other request. */ - if (get_pcap_linktype(pch, devname) == dlt) - return NULL; /* no error */ - return "That DLT isn't one of the DLTs supported by this device"; -#endif + g_list_foreach(caps->data_link_types, free_linktype_cb, NULL); + g_list_free(caps->data_link_types); + g_free(caps); } const char *