};
-static u8 *
+u8 *
format_af_packet_device_name (u8 * s, va_list * args)
{
u32 i = va_arg (*args, u32);
vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
af_packet_if_t *apif =
pool_elt_at_index (apm->interfaces, rd->dev_instance);
+ clib_spinlock_lock_if_init (&apif->lockp);
int block = 0;
u32 block_size = apif->tx_req->tp_block_size;
u32 frame_size = apif->tx_req->tp_frame_size;
struct tpacket2_hdr *tph;
u32 frame_not_ready = 0;
- clib_spinlock_lock_if_init (&apif->lockp);
-
while (n_left > 0)
{
u32 len;
tph->tp_status = TP_STATUS_SEND_REQUEST;
n_sent++;
next:
+ tx_frame = (tx_frame + 1) % frame_num;
+
/* check if we've exhausted the ring */
if (PREDICT_FALSE (frame_not_ready + n_sent == frame_num))
break;
-
- tx_frame = (tx_frame + 1) % frame_num;
}
CLIB_MEMORY_BARRIER ();
int rv, fd = socket (AF_UNIX, SOCK_DGRAM, 0);
struct ifreq ifr;
+ if (0 > fd)
+ {
+ vlib_log_warn (apm->log_class, "af_packet_%s could not open socket",
+ apif->host_if_name);
+ return 0;
+ }
+
/* if interface is a bridge ignore */
if (apif->host_if_index < 0)
goto error; /* no error */
ifr.ifr_ifindex = apif->host_if_index;
if ((rv = ioctl (fd, SIOCGIFNAME, &ifr)) < 0)
{
- clib_unix_warning ("af_packet_%s ioctl could not retrieve eth name",
- apif->host_if_name);
+ vlib_log_warn (apm->log_class,
+ "af_packet_%s ioctl could not retrieve eth name",
+ apif->host_if_name);
goto error;
}
if ((rv = ioctl (fd, SIOCGIFFLAGS, &ifr)) < 0)
{
- clib_unix_warning ("af_packet_%s error: %d",
- apif->is_admin_up ? "up" : "down", rv);
+ vlib_log_warn (apm->log_class, "af_packet_%s error: %d",
+ apif->is_admin_up ? "up" : "down", rv);
goto error;
}
if ((rv = ioctl (fd, SIOCSIFFLAGS, &ifr)) < 0)
{
- clib_unix_warning ("af_packet_%s error: %d",
- apif->is_admin_up ? "up" : "down", rv);
+ vlib_log_warn (apm->log_class, "af_packet_%s error: %d",
+ apif->is_admin_up ? "up" : "down", rv);
goto error;
}
vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
error:
- close (fd);
+ if (0 <= fd)
+ close (fd);
return 0; /* no error */
}
}
static clib_error_t *af_packet_set_mac_address_function
- (struct vnet_hw_interface_t *hi, char *address)
+ (struct vnet_hw_interface_t *hi, const u8 * old_address, const u8 * address)
{
af_packet_main_t *apm = &af_packet_main;
af_packet_if_t *apif =
int rv, fd = socket (AF_UNIX, SOCK_DGRAM, 0);
struct ifreq ifr;
+ if (0 > fd)
+ {
+ vlib_log_warn (apm->log_class, "af_packet_%s could not open socket",
+ apif->host_if_name);
+ return 0;
+ }
+
/* if interface is a bridge ignore */
if (apif->host_if_index < 0)
goto error; /* no error */
ifr.ifr_ifindex = apif->host_if_index;
if ((rv = ioctl (fd, SIOCGIFNAME, &ifr)) < 0)
{
- clib_unix_warning
- ("af_packet_%s ioctl could not retrieve eth name, error: %d",
+ vlib_log_warn
+ (apm->log_class,
+ "af_packet_%s ioctl could not retrieve eth name, error: %d",
apif->host_if_name, rv);
goto error;
}
if ((rv = ioctl (fd, SIOCSIFHWADDR, &ifr)) < 0)
{
- clib_unix_warning ("af_packet_%s ioctl could not set mac, error: %d",
- apif->host_if_name, rv);
+ vlib_log_warn (apm->log_class,
+ "af_packet_%s ioctl could not set mac, error: %d",
+ apif->host_if_name, rv);
goto error;
}
error:
- close (fd);
+
+ if (0 <= fd)
+ close (fd);
return 0; /* no error */
}