#include "rtbsd.h"
#include "coverage.h"
+#include "dp-packet.h"
#include "dpif-netdev.h"
#include "dynamic-string.h"
#include "fatal-signal.h"
#include "socket-util.h"
#include "svec.h"
#include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(netdev_bsd);
/* 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);
}
static int
-netdev_bsd_rxq_recv(struct netdev_rxq *rxq_, struct ofpbuf **packet, int *c)
+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 dp_packet *packet;
struct ofpbuf *buffer;
ssize_t retval;
int mtu;
mtu = ETH_PAYLOAD_MAX;
}
- buffer = ofpbuf_new_with_headroom(VLAN_ETH_HEADER_LEN + mtu, DP_NETDEV_HEADROOM);
+ 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));
if (retval) {
- ofpbuf_delete(buffer);
+ dp_packet_delete(packet);
} else {
dp_packet_pad(buffer);
- packet[0] = buffer;
+ dp_packet_set_dp_hash(packet, 0);
+ packets[0] = packet;
*c = 1;
}
return retval;
* system or a tap device.
*/
static int
-netdev_bsd_send(struct netdev *netdev_, struct ofpbuf *pkt, bool may_steal)
+netdev_bsd_send(struct netdev *netdev_, int qid OVS_UNUSED,
+ struct dp_packet **pkts, int cnt, bool may_steal)
{
struct netdev_bsd *dev = netdev_bsd_cast(netdev_);
const char *name = netdev_get_name(netdev_);
- const void *data = ofpbuf_data(pkt);
- size_t size = ofpbuf_size(pkt);
int error;
+ int i;
ovs_mutex_lock(&dev->mutex);
if (dev->tap_fd < 0 && !dev->pcap) {
error = 0;
}
- while (!error) {
- ssize_t retval;
- if (dev->tap_fd >= 0) {
- retval = write(dev->tap_fd, data, size);
- } else {
- retval = pcap_inject(dev->pcap, data, size);
- }
- if (retval < 0) {
- if (errno == EINTR) {
- continue;
+ for (i = 0; i < cnt; i++) {
+ const void *data = ofpbuf_data(&pkts[i]->ofpbuf);
+ size_t size = ofpbuf_size(&pkts[i]->ofpbuf);
+
+ while (!error) {
+ ssize_t retval;
+ if (dev->tap_fd >= 0) {
+ retval = write(dev->tap_fd, data, size);
} else {
- error = errno;
- if (error != EAGAIN) {
- VLOG_WARN_RL(&rl, "error sending Ethernet packet on %s: "
- "%s", name, ovs_strerror(error));
+ retval = pcap_inject(dev->pcap, data, size);
+ }
+ if (retval < 0) {
+ if (errno == EINTR) {
+ continue;
+ } else {
+ error = errno;
+ if (error != EAGAIN) {
+ VLOG_WARN_RL(&rl, "error sending Ethernet packet on"
+ " %s: %s", name, ovs_strerror(error));
+ }
}
+ } else if (retval != size) {
+ VLOG_WARN_RL(&rl, "sent partial Ethernet packet "
+ "(%"PRIuSIZE" bytes of "
+ "%"PRIuSIZE") on %s", retval, size, name);
+ error = EMSGSIZE;
+ } else {
+ break;
}
- } else if (retval != size) {
- VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIuSIZE" bytes of "
- "%"PRIuSIZE") on %s", retval, size, name);
- error = EMSGSIZE;
- } else {
- break;
}
}
ovs_mutex_unlock(&dev->mutex);
if (may_steal) {
- ofpbuf_delete(pkt);
+ for (i = 0; i < cnt; i++) {
+ dp_packet_delete(pkts[i]);
+ }
}
return error;
* with netdev_send().
*/
static void
-netdev_bsd_send_wait(struct netdev *netdev_)
+netdev_bsd_send_wait(struct netdev *netdev_, int qid OVS_UNUSED)
{
struct netdev_bsd *dev = netdev_bsd_cast(netdev_);
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) {
netdev_get_name(netdev_), ovs_strerror(errno));
return errno;
} else if (!strcmp(ifmd.ifmd_name, netdev_get_name(netdev_))) {
- convert_stats(netdev, stats, &ifdr.ifdr_data);
+ convert_stats(netdev_, stats, &ifmd.ifmd_data);
break;
}
}
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
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_multiq */ \
\
netdev_bsd_send, \
netdev_bsd_send_wait, \
NULL, /* get_carrier_resets */ \
NULL, /* set_miimon_interval */ \
netdev_bsd_get_stats, \
- NULL, /* set_stats */ \
\
GET_FEATURES, \
NULL, /* set_advertisement */ \
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);
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;
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;
}
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
#endif
}
+#if defined(__NetBSD__)
/* Calls ioctl() on an AF_LINK sock, passing the specified 'command' and
* 'arg'. Returns 0 if successful, otherwise a positive errno value. */
int
: ioctl(sock, command, arg) == -1 ? errno
: 0);
}
+#endif
projects / cascardo / ovs.git / blobdiff