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=f62d0adacc16a9704400081bf9a9d5d1187138e8;hb=683c3c386cf6a16e00536d8d4212feaa92bb96b9;hpb=88547059e5563bde42d4089416e1069ca4bf8c5f diff --git a/capture-pcap-util.c b/capture-pcap-util.c index f62d0adacc..3b1ebbf8f9 100644 --- a/capture-pcap-util.c +++ b/capture-pcap-util.c @@ -28,11 +28,10 @@ #ifdef HAVE_LIBPCAP -#include - #include #include +#include #include #include @@ -45,8 +44,9 @@ #endif #include -#include +#include +#include "capture_ifinfo.h" #include "capture-pcap-util.h" #include "capture-pcap-util-int.h" @@ -54,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; } @@ -197,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; @@ -206,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 } @@ -248,15 +124,21 @@ if_info_ip(if_info_t *if_info, pcap_if_t *d) } } +#ifdef HAVE_PCAP_REMOTE GList * -get_interface_list_findalldevs(int *err, char *err_str) +get_interface_list_findalldevs_ex(const char *source, + struct pcap_rmtauth *auth, + int *err, char **err_str) { GList *il = NULL; pcap_if_t *alldevs, *dev; if_info_t *if_info; + char errbuf[PCAP_ERRBUF_SIZE]; - if (pcap_findalldevs(&alldevs, err_str) == -1) { + if (pcap_findalldevs_ex((char *)source, auth, &alldevs, errbuf) == -1) { *err = CANT_GET_INTERFACE_LIST; + if (err_str != NULL) + *err_str = cant_get_if_list_error_message(errbuf); return NULL; } @@ -265,6 +147,44 @@ get_interface_list_findalldevs(int *err, char *err_str) * No interfaces found. */ *err = NO_INTERFACES_FOUND; + if (err_str != NULL) + *err_str = NULL; + return NULL; + } + + for (dev = alldevs; dev != NULL; dev = dev->next) { + if_info = if_info_new(dev->name, dev->description); + il = g_list_append(il, if_info); + if_info_ip(if_info, dev); + } + pcap_freealldevs(alldevs); + + return il; +} +#endif + +GList * +get_interface_list_findalldevs(int *err, char **err_str) +{ + GList *il = NULL; + pcap_if_t *alldevs, *dev; + if_info_t *if_info; + char errbuf[PCAP_ERRBUF_SIZE]; + + if (pcap_findalldevs(&alldevs, errbuf) == -1) { + *err = CANT_GET_INTERFACE_LIST; + if (err_str != NULL) + *err_str = cant_get_if_list_error_message(errbuf); + return NULL; + } + + if (alldevs == NULL) { + /* + * No interfaces found. + */ + *err = NO_INTERFACES_FOUND; + if (err_str != NULL) + *err_str = NULL; return NULL; } @@ -288,14 +208,14 @@ 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); - if (if_info->description != NULL) - g_free(if_info->description); + 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); } void @@ -305,147 +225,121 @@ free_interface_list(GList *if_list) g_list_free(if_list); } -/* - * Get the data-link types available for a libpcap device. - */ -static data_link_info_t * -create_data_link_info(int dlt) +#if !defined(HAVE_PCAP_DATALINK_NAME_TO_VAL) || !defined(HAVE_PCAP_DATALINK_VAL_TO_NAME) || !defined(HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION) +struct dlt_choice { + const char *name; + const char *description; + int dlt; +}; + +#define DLT_CHOICE(code, description) { #code, description, code } +#define DLT_CHOICE_SENTINEL { NULL, NULL, 0 } + +static struct dlt_choice dlt_choices[] = { + DLT_CHOICE(DLT_NULL, "BSD loopback"), + DLT_CHOICE(DLT_EN10MB, "Ethernet"), + DLT_CHOICE(DLT_IEEE802, "Token ring"), + DLT_CHOICE(DLT_ARCNET, "ARCNET"), + DLT_CHOICE(DLT_SLIP, "SLIP"), + DLT_CHOICE(DLT_PPP, "PPP"), + DLT_CHOICE(DLT_FDDI, "FDDI"), + DLT_CHOICE(DLT_ATM_RFC1483, "RFC 1483 IP-over-ATM"), + DLT_CHOICE(DLT_RAW, "Raw IP"), + DLT_CHOICE(DLT_SLIP_BSDOS, "BSD/OS SLIP"), + DLT_CHOICE(DLT_PPP_BSDOS, "BSD/OS PPP"), + DLT_CHOICE(DLT_ATM_CLIP, "Linux Classical IP-over-ATM"), + DLT_CHOICE(DLT_PPP_SERIAL, "PPP over serial"), + DLT_CHOICE(DLT_PPP_ETHER, "PPPoE"), + DLT_CHOICE(DLT_C_HDLC, "Cisco HDLC"), + DLT_CHOICE(DLT_IEEE802_11, "802.11"), + DLT_CHOICE(DLT_FRELAY, "Frame Relay"), + DLT_CHOICE(DLT_LOOP, "OpenBSD loopback"), + DLT_CHOICE(DLT_ENC, "OpenBSD encapsulated IP"), + DLT_CHOICE(DLT_LINUX_SLL, "Linux cooked"), + DLT_CHOICE(DLT_LTALK, "Localtalk"), + DLT_CHOICE(DLT_PFLOG, "OpenBSD pflog file"), + DLT_CHOICE(DLT_PRISM_HEADER, "802.11 plus Prism header"), + DLT_CHOICE(DLT_IP_OVER_FC, "RFC 2625 IP-over-Fibre Channel"), + DLT_CHOICE(DLT_SUNATM, "Sun raw ATM"), + DLT_CHOICE(DLT_IEEE802_11_RADIO, "802.11 plus BSD radio information header"), + DLT_CHOICE(DLT_APPLE_IP_OVER_IEEE1394, "Apple IP-over-IEEE 1394"), + DLT_CHOICE(DLT_ARCNET_LINUX, "Linux ARCNET"), + DLT_CHOICE(DLT_LINUX_IRDA, "Linux IrDA"), + DLT_CHOICE(DLT_IEEE802_11_RADIO_AVS, "802.11 plus AVS radio information header"), + DLT_CHOICE_SENTINEL +}; + +#if !defined(HAVE_PCAP_DATALINK_NAME_TO_VAL) +static int +pcap_datalink_name_to_val(const char *name) { - data_link_info_t *data_link_info; -#ifdef HAVE_PCAP_DATALINK_VAL_TO_NAME - const char *typename; -#endif - int wtap_encap; - - data_link_info = g_malloc(sizeof (data_link_info_t)); - data_link_info->dlt = dlt; -#ifdef HAVE_PCAP_DATALINK_VAL_TO_NAME - typename = pcap_datalink_val_to_name(dlt); - if (typename != NULL) - data_link_info->name = g_strdup(typename); - else -#endif - data_link_info->name = g_strdup_printf("DLT %d", dlt); - wtap_encap = wtap_pcap_encap_to_wtap_encap(dlt); - if (wtap_encap == WTAP_ENCAP_UNKNOWN) { - /* - * We don't support this in Wiretap. - * However, we should, so you can capture on it. - * Put in an entry for it, with no description. - */ - data_link_info->description = NULL; - } else { - /* - * If this is null, that's a bug in - * "wtap_pcap_encap_to_wtap_encap()" - it should always - * return a valid encapsulation type - so we assume it's - * not null. - */ - data_link_info->description = - g_strdup(wtap_encap_string(wtap_encap)); + int i; + + for (i = 0; dlt_choices[i].name != NULL; i++) { + if (g_ascii_strcasecmp(dlt_choices[i].name + sizeof("DLT_") - 1, + name) == 0) + return (dlt_choices[i].dlt); } - return data_link_info; + return (-1); } +#endif /* defined(HAVE_PCAP_DATALINK_NAME_TO_VAL) */ -GList * -get_pcap_linktype_list(const char *devname, char *err_buf) +#if !defined(HAVE_PCAP_DATALINK_VAL_TO_NAME) +static const char * +pcap_datalink_val_to_name(int dlt) { - GList *linktype_list = NULL; - pcap_t *pch; - int deflt; -#ifdef HAVE_PCAP_SET_DATALINK - int *linktypes; - int i, nlt; -#endif - data_link_info_t *data_link_info; - - pch = pcap_open_live(devname, MIN_PACKET_SIZE, 0, 0, err_buf); - if (pch == NULL) - return NULL; - err_buf[0] = '\0'; /* an empty list doesn't mean an error */ - 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); - return NULL; - } - for (i = 0; i < nlt; i++) { - data_link_info = create_data_link_info(linktypes[i]); + int 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); + for (i = 0; dlt_choices[i].name != NULL; i++) { + if (dlt_choices[i].dlt == dlt) + return (dlt_choices[i].name + sizeof("DLT_") - 1); } - free(linktypes); -#else - data_link_info = create_data_link_info(deflt); - linktype_list = g_list_append(linktype_list, data_link_info); -#endif + return (NULL); +} +#endif /* defined(HAVE_PCAP_DATALINK_VAL_TO_NAME) */ - pcap_close(pch); - return linktype_list; +#if !defined(HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION) +const char * +pcap_datalink_val_to_description(int dlt) +{ + int i; + + for (i = 0; dlt_choices[i].name != NULL; i++) { + if (dlt_choices[i].dlt == dlt) + return (dlt_choices[i].description); + } + return (NULL); } +#endif /* defined(HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION) */ + +#endif /* !defined(HAVE_PCAP_DATALINK_VAL_TO_NAME) || !defined(HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION) */ 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); - if (linktype_info->description != NULL) - g_free(linktype_info->description); + 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); + g_list_foreach(caps->data_link_types, free_linktype_cb, NULL); + g_list_free(caps->data_link_types); + g_free(caps); } -/* 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 -} - - -#ifdef HAVE_PCAP_DATALINK_VAL_TO_NAME const char * linktype_val_to_name(int dlt) { return pcap_datalink_val_to_name(dlt); } -#endif -#ifdef HAVE_PCAP_DATALINK_NAME_TO_VAL int linktype_name_to_val(const char *linktype) { return pcap_datalink_name_to_val(linktype); } -#endif #endif /* HAVE_LIBPCAP */