* limitations under the License.
*/
+#if !defined(__MACH__)
#include <config.h>
#include "netdev-provider.h"
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/sockio.h>
+#include <net/bpf.h>
#include <ifaddrs.h>
#include <pcap/pcap.h>
#include <net/if.h>
#include <sys/sysctl.h>
#if defined(__NetBSD__)
#include <net/route.h>
-#include <netinet/in.h>
#include <netinet/if_inarp.h>
#endif
#include "rtbsd.h"
#include "coverage.h"
+#include "dp-packet.h"
#include "dpif-netdev.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
-#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "ovs-thread.h"
-#include "packet-dpif.h"
#include "packets.h"
#include "poll-loop.h"
#include "shash.h"
#include "socket-util.h"
#include "svec.h"
#include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(netdev_bsd);
unsigned int cache_valid;
int ifindex;
- uint8_t etheraddr[ETH_ADDR_LEN];
- struct in_addr in4;
- struct in_addr netmask;
- struct in6_addr in6;
+ struct eth_addr etheraddr;
int mtu;
int carrier;
enum {
- VALID_IFINDEX = 1 << 0,
+ VALID_IFINDEX = 1 << 0,
VALID_ETHERADDR = 1 << 1,
- VALID_IN4 = 1 << 2,
- VALID_IN6 = 1 << 3,
- VALID_MTU = 1 << 4,
- VALID_CARRIER = 1 << 5
+ VALID_IN = 1 << 2,
+ VALID_MTU = 1 << 3,
+ VALID_CARRIER = 1 << 4
};
#define PCAP_SNAPLEN 2048
static int do_set_addr(struct netdev *netdev,
unsigned long ioctl_nr, const char *ioctl_name,
struct in_addr addr);
-static int get_etheraddr(const char *netdev_name, uint8_t ea[ETH_ADDR_LEN]);
+static int get_etheraddr(const char *netdev_name, struct eth_addr *ea);
static int set_etheraddr(const char *netdev_name, int hwaddr_family,
- int hwaddr_len, const uint8_t[ETH_ADDR_LEN]);
+ int hwaddr_len, const struct eth_addr);
static int get_ifindex(const struct netdev *, int *ifindexp);
static int ifr_get_flags(const struct ifreq *);
if (error == ENXIO) {
free(netdev->kernel_name);
cache_notifier_unref();
+ ovs_mutex_destroy(&netdev->mutex);
return error;
}
/* Turn device UP */
ifr_set_flags(&ifr, IFF_UP);
- strncpy(ifr.ifr_name, kernel_name, sizeof ifr.ifr_name);
+ ovs_strlcpy(ifr.ifr_name, kernel_name, sizeof ifr.ifr_name);
error = af_inet_ioctl(SIOCSIFFLAGS, &ifr);
if (error) {
destroy_tap(netdev->tap_fd, kernel_name);
* from rxq->pcap.
*/
static int
-netdev_rxq_bsd_recv_pcap(struct netdev_rxq_bsd *rxq, struct ofpbuf *buffer)
+netdev_rxq_bsd_recv_pcap(struct netdev_rxq_bsd *rxq, struct dp_packet *buffer)
{
struct pcap_arg arg;
int ret;
/* prepare the pcap argument to store the packet */
- arg.size = ofpbuf_tailroom(buffer);
- arg.data = ofpbuf_data(buffer);
+ arg.size = dp_packet_tailroom(buffer);
+ arg.data = dp_packet_data(buffer);
for (;;) {
ret = pcap_dispatch(rxq->pcap_handle, 1, proc_pkt, (u_char *) &arg);
if (ret > 0) {
- ofpbuf_set_size(buffer, ofpbuf_size(buffer) + arg.retval);
+ dp_packet_set_size(buffer, dp_packet_size(buffer) + arg.retval);
return 0;
}
if (ret == -1) {
* 'rxq->fd' is initialized with the tap file descriptor.
*/
static int
-netdev_rxq_bsd_recv_tap(struct netdev_rxq_bsd *rxq, struct ofpbuf *buffer)
+netdev_rxq_bsd_recv_tap(struct netdev_rxq_bsd *rxq, struct dp_packet *buffer)
{
- size_t size = ofpbuf_tailroom(buffer);
+ size_t size = dp_packet_tailroom(buffer);
for (;;) {
- ssize_t retval = read(rxq->fd, ofpbuf_data(buffer), size);
+ ssize_t retval = read(rxq->fd, dp_packet_data(buffer), size);
if (retval >= 0) {
- ofpbuf_set_size(buffer, ofpbuf_size(buffer) + retval);
+ dp_packet_set_size(buffer, dp_packet_size(buffer) + retval);
return 0;
} else if (errno != EINTR) {
if (errno != EAGAIN) {
}
static int
-netdev_bsd_rxq_recv(struct netdev_rxq *rxq_, struct dpif_packet **packets,
+netdev_bsd_rxq_recv(struct netdev_rxq *rxq_, struct dp_packet **packets,
int *c)
{
struct netdev_rxq_bsd *rxq = netdev_rxq_bsd_cast(rxq_);
struct netdev *netdev = rxq->up.netdev;
- struct dpif_packet *packet;
- struct ofpbuf *buffer;
+ struct dp_packet *packet;
ssize_t retval;
int mtu;
mtu = ETH_PAYLOAD_MAX;
}
- packet = dpif_packet_new_with_headroom(VLAN_ETH_HEADER_LEN + mtu,
+ packet = dp_packet_new_with_headroom(VLAN_ETH_HEADER_LEN + mtu,
DP_NETDEV_HEADROOM);
- buffer = &packet->ofpbuf;
-
retval = (rxq->pcap_handle
- ? netdev_rxq_bsd_recv_pcap(rxq, buffer)
- : netdev_rxq_bsd_recv_tap(rxq, buffer));
+ ? netdev_rxq_bsd_recv_pcap(rxq, packet)
+ : netdev_rxq_bsd_recv_tap(rxq, packet));
if (retval) {
- dpif_packet_delete(packet);
+ dp_packet_delete(packet);
} else {
- dp_packet_pad(buffer);
- dpif_packet_set_dp_hash(packet, 0);
+ dp_packet_pad(packet);
packets[0] = packet;
*c = 1;
}
*/
static int
netdev_bsd_send(struct netdev *netdev_, int qid OVS_UNUSED,
- struct dpif_packet **pkts, int cnt, bool may_steal)
+ struct dp_packet **pkts, int cnt, bool may_steal)
{
struct netdev_bsd *dev = netdev_bsd_cast(netdev_);
const char *name = netdev_get_name(netdev_);
}
for (i = 0; i < cnt; i++) {
- const void *data = ofpbuf_data(&pkts[i]->ofpbuf);
- size_t size = ofpbuf_size(&pkts[i]->ofpbuf);
+ const void *data = dp_packet_data(pkts[i]);
+ size_t size = dp_packet_size(pkts[i]);
while (!error) {
ssize_t retval;
ovs_mutex_unlock(&dev->mutex);
if (may_steal) {
for (i = 0; i < cnt; i++) {
- dpif_packet_delete(pkts[i]);
+ dp_packet_delete(pkts[i]);
}
}
*/
static int
netdev_bsd_set_etheraddr(struct netdev *netdev_,
- const uint8_t mac[ETH_ADDR_LEN])
+ const struct eth_addr mac)
{
struct netdev_bsd *netdev = netdev_bsd_cast(netdev_);
int error = 0;
ETH_ADDR_LEN, mac);
if (!error) {
netdev->cache_valid |= VALID_ETHERADDR;
- memcpy(netdev->etheraddr, mac, ETH_ADDR_LEN);
+ netdev->etheraddr = mac;
netdev_change_seq_changed(netdev_);
}
}
* free the returned buffer.
*/
static int
-netdev_bsd_get_etheraddr(const struct netdev *netdev_,
- uint8_t mac[ETH_ADDR_LEN])
+netdev_bsd_get_etheraddr(const struct netdev *netdev_, struct eth_addr *mac)
{
struct netdev_bsd *netdev = netdev_bsd_cast(netdev_);
int error = 0;
ovs_mutex_lock(&netdev->mutex);
if (!(netdev->cache_valid & VALID_ETHERADDR)) {
error = get_etheraddr(netdev_get_kernel_name(netdev_),
- netdev->etheraddr);
+ &netdev->etheraddr);
if (!error) {
netdev->cache_valid |= VALID_ETHERADDR;
}
}
if (!error) {
- memcpy(mac, netdev->etheraddr, ETH_ADDR_LEN);
+ *mac = netdev->etheraddr;
}
ovs_mutex_unlock(&netdev->mutex);
}
ovs_mutex_unlock(&netdev->mutex);
- return 0;
+ return error;
}
static int
struct ifmediareq ifmr;
memset(&ifmr, 0, sizeof(ifmr));
- strncpy(ifmr.ifm_name, netdev_get_kernel_name(netdev_),
- sizeof ifmr.ifm_name);
+ ovs_strlcpy(ifmr.ifm_name, netdev_get_kernel_name(netdev_),
+ sizeof ifmr.ifm_name);
error = af_inet_ioctl(SIOCGIFMEDIA, &ifmr);
if (!error) {
int error;
memset(&ifdr, 0, sizeof(ifdr));
- strncpy(ifdr.ifdr_name, netdev_get_kernel_name(netdev_),
- sizeof(ifdr.ifdr_name));
+ ovs_strlcpy(ifdr.ifdr_name, netdev_get_kernel_name(netdev_),
+ sizeof(ifdr.ifdr_name));
error = af_link_ioctl(SIOCGIFDATA, &ifdr);
if (!error) {
convert_stats(netdev_, stats, &ifdr.ifdr_data);
/* XXX Look into SIOCGIFCAP instead of SIOCGIFMEDIA */
memset(&ifmr, 0, sizeof(ifmr));
- strncpy(ifmr.ifm_name, netdev_get_name(netdev), sizeof ifmr.ifm_name);
+ ovs_strlcpy(ifmr.ifm_name, netdev_get_name(netdev), sizeof ifmr.ifm_name);
/* We make two SIOCGIFMEDIA ioctl calls. The first to determine the
* number of supported modes, and a second with a buffer to retrieve
return error;
}
-/*
- * If 'netdev' has an assigned IPv4 address, sets '*in4' to that address and
- * '*netmask' to its netmask and returns true. Otherwise, returns false.
- */
-static int
-netdev_bsd_get_in4(const struct netdev *netdev_, struct in_addr *in4,
- struct in_addr *netmask)
-{
- struct netdev_bsd *netdev = netdev_bsd_cast(netdev_);
- int error = 0;
-
- ovs_mutex_lock(&netdev->mutex);
- if (!(netdev->cache_valid & VALID_IN4)) {
- struct ifreq ifr;
-
- ifr.ifr_addr.sa_family = AF_INET;
- error = af_inet_ifreq_ioctl(netdev_get_kernel_name(netdev_), &ifr,
- SIOCGIFADDR, "SIOCGIFADDR");
- if (!error) {
- const struct sockaddr_in *sin;
-
- sin = ALIGNED_CAST(struct sockaddr_in *, &ifr.ifr_addr);
- netdev->in4 = sin->sin_addr;
- netdev->cache_valid |= VALID_IN4;
- error = af_inet_ifreq_ioctl(netdev_get_kernel_name(netdev_), &ifr,
- SIOCGIFNETMASK, "SIOCGIFNETMASK");
- if (!error) {
- *netmask = sin->sin_addr;
- }
- }
- }
- if (!error) {
- *in4 = netdev->in4;
- *netmask = netdev->netmask;
- }
- ovs_mutex_unlock(&netdev->mutex);
-
- return error ? error : in4->s_addr == INADDR_ANY ? EADDRNOTAVAIL : 0;
-}
-
/*
* Assigns 'addr' as 'netdev''s IPv4 address and 'mask' as its netmask. If
* 'addr' is INADDR_ANY, 'netdev''s IPv4 address is cleared. Returns a
if (addr.s_addr != INADDR_ANY) {
error = do_set_addr(netdev_, SIOCSIFNETMASK,
"SIOCSIFNETMASK", mask);
- if (!error) {
- netdev->cache_valid |= VALID_IN4;
- netdev->in4 = addr;
- netdev->netmask = mask;
- }
}
netdev_change_seq_changed(netdev_);
}
}
static int
-netdev_bsd_get_in6(const struct netdev *netdev_, struct in6_addr *in6)
+netdev_bsd_get_addr_list(const struct netdev *netdev_,
+ struct in6_addr **addr, struct in6_addr **mask, int *n_cnt)
{
struct netdev_bsd *netdev = netdev_bsd_cast(netdev_);
- if (!(netdev->cache_valid & VALID_IN6)) {
- struct ifaddrs *ifa, *head;
- struct sockaddr_in6 *sin6;
- const char *netdev_name = netdev_get_name(netdev_);
-
- if (getifaddrs(&head) != 0) {
- VLOG_ERR("getifaddrs on %s device failed: %s", netdev_name,
- ovs_strerror(errno));
- return errno;
- }
+ int error;
- for (ifa = head; ifa; ifa = ifa->ifa_next) {
- if (ifa->ifa_addr->sa_family == AF_INET6 &&
- !strcmp(ifa->ifa_name, netdev_name)) {
- sin6 = ALIGNED_CAST(struct sockaddr_in6 *, ifa->ifa_addr);
- if (sin6) {
- memcpy(&netdev->in6, &sin6->sin6_addr, sin6->sin6_len);
- netdev->cache_valid |= VALID_IN6;
- *in6 = netdev->in6;
- freeifaddrs(head);
- return 0;
- }
- }
- }
- return EADDRNOTAVAIL;
+ if (!(netdev->cache_valid & VALID_IN)) {
+ netdev_get_addrs_list_flush();
}
- *in6 = netdev->in6;
- return 0;
+ error = netdev_get_addrs(netdev_get_name(netdev_), addr, mask, n_cnt);
+ if (!error) {
+ netdev->cache_valid |= VALID_IN;
+ }
+ return error;
}
#if defined(__NetBSD__)
static int
netdev_bsd_arp_lookup(const struct netdev *netdev OVS_UNUSED,
ovs_be32 ip OVS_UNUSED,
- uint8_t mac[ETH_ADDR_LEN] OVS_UNUSED)
+ struct eth_addr *mac OVS_UNUSED)
{
#if defined(__NetBSD__)
const struct rt_msghdr *rtm;
GET_FEATURES) \
{ \
NAME, \
+ false, /* is_pmd */ \
\
NULL, /* init */ \
netdev_bsd_run, \
NULL, /* get_config */ \
NULL, /* set_config */ \
NULL, /* get_tunnel_config */ \
+ NULL, /* build header */ \
+ NULL, /* push header */ \
+ NULL, /* pop header */ \
NULL, /* get_numa_id */ \
+ NULL, /* set_tx_multiq */ \
\
netdev_bsd_send, \
netdev_bsd_send_wait, \
NULL, /* queue_dump_done */ \
NULL, /* dump_queue_stats */ \
\
- netdev_bsd_get_in4, \
netdev_bsd_set_in4, \
- netdev_bsd_get_in6, \
+ netdev_bsd_get_addr_list, \
NULL, /* add_router */ \
netdev_bsd_get_next_hop, \
NULL, /* get_status */ \
netdev_bsd_arp_lookup, /* arp_lookup */ \
\
netdev_bsd_update_flags, \
+ NULL, /* reconfigure */ \
\
netdev_bsd_rxq_alloc, \
netdev_bsd_rxq_construct, \
}
static int
-get_etheraddr(const char *netdev_name, uint8_t ea[ETH_ADDR_LEN])
+get_etheraddr(const char *netdev_name, struct eth_addr *ea)
{
struct ifaddrs *head;
struct ifaddrs *ifa;
static int
set_etheraddr(const char *netdev_name OVS_UNUSED, int hwaddr_family OVS_UNUSED,
int hwaddr_len OVS_UNUSED,
- const uint8_t mac[ETH_ADDR_LEN] OVS_UNUSED)
+ const struct eth_addr mac OVS_UNUSED)
{
#if defined(__FreeBSD__)
struct ifreq ifr;
int error;
memset(&ifr, 0, sizeof ifr);
- strncpy(ifr.ifr_name, netdev_name, sizeof ifr.ifr_name);
+ ovs_strlcpy(ifr.ifr_name, netdev_name, sizeof ifr.ifr_name);
ifr.ifr_addr.sa_family = hwaddr_family;
ifr.ifr_addr.sa_len = hwaddr_len;
- memcpy(ifr.ifr_addr.sa_data, mac, hwaddr_len);
+ memcpy(ifr.ifr_addr.sa_data, &mac, hwaddr_len);
error = af_inet_ioctl(SIOCSIFLLADDR, &ifr);
if (error) {
VLOG_ERR("ioctl(SIOCSIFLLADDR) on %s device failed: %s",
return EOPNOTSUPP;
}
memset(&req, 0, sizeof(req));
- strncpy(req.iflr_name, netdev_name, sizeof(req.iflr_name));
+ ovs_strlcpy(req.iflr_name, netdev_name, sizeof(req.iflr_name));
req.addr.ss_len = sizeof(req.addr);
req.addr.ss_family = hwaddr_family;
sdl = (struct sockaddr_dl *)&req.addr;
if (error) {
return error;
}
- if (!memcmp(&sdl->sdl_data[sdl->sdl_nlen], mac, hwaddr_len)) {
+ if (!memcmp(&sdl->sdl_data[sdl->sdl_nlen], &mac, hwaddr_len)) {
return 0;
}
oldaddr = req.addr;
memset(&req, 0, sizeof(req));
- strncpy(req.iflr_name, netdev_name, sizeof(req.iflr_name));
+ ovs_strlcpy(req.iflr_name, netdev_name, sizeof(req.iflr_name));
req.flags = IFLR_ACTIVE;
sdl = (struct sockaddr_dl *)&req.addr;
sdl->sdl_len = offsetof(struct sockaddr_dl, sdl_data) + hwaddr_len;
sdl->sdl_alen = hwaddr_len;
sdl->sdl_family = hwaddr_family;
- memcpy(sdl->sdl_data, mac, hwaddr_len);
+ memcpy(sdl->sdl_data, &mac, hwaddr_len);
error = af_link_ioctl(SIOCALIFADDR, &req);
if (error) {
return error;
}
memset(&req, 0, sizeof(req));
- strncpy(req.iflr_name, netdev_name, sizeof(req.iflr_name));
+ ovs_strlcpy(req.iflr_name, netdev_name, sizeof(req.iflr_name));
req.addr = oldaddr;
return af_link_ioctl(SIOCDLIFADDR, &req);
#else
ifr_get_flags(const struct ifreq *ifr)
{
#ifdef HAVE_STRUCT_IFREQ_IFR_FLAGSHIGH
- return (ifr->ifr_flagshigh << 16) | ifr->ifr_flags;
+ return (ifr->ifr_flagshigh << 16) | (ifr->ifr_flags & 0xffff);
#else
return ifr->ifr_flags;
#endif
static void
ifr_set_flags(struct ifreq *ifr, int flags)
{
- ifr->ifr_flags = flags;
#ifdef HAVE_STRUCT_IFREQ_IFR_FLAGSHIGH
+ ifr->ifr_flags = flags & 0xffff;
ifr->ifr_flagshigh = flags >> 16;
+#else
+ ifr->ifr_flags = flags;
#endif
}
: 0);
}
#endif
+#endif /* !defined(__MACH__) */
projects / cascardo / ovs.git / blobdiff