#include "sflow_api.h"
#include "socket-util.h"
#include "timeval.h"
-
-#define THIS_MODULE VLM_sflow
#include "vlog.h"
+VLOG_DEFINE_THIS_MODULE(sflow)
+
struct ofproto_sflow_port {
struct netdev *netdev; /* Underlying network device, for stats. */
SFLDataSource_instance dsi; /* sFlow library's notion of port number. */
counters->ifDirection = 0;
}
if (!netdev_get_flags(osp->netdev, &flags) && flags & NETDEV_UP) {
- bool carrier;
-
counters->ifStatus = 1; /* ifAdminStatus up. */
- if (!netdev_get_carrier(osp->netdev, &carrier) && carrier) {
+ if (netdev_get_carrier(osp->netdev)) {
counters->ifStatus |= 2; /* ifOperStatus us. */
}
} else {
if (agent_device) {
struct netdev *netdev;
- if (!netdev_open(agent_device, NETDEV_ETH_TYPE_NONE, &netdev)) {
+ if (!netdev_open_default(agent_device, &netdev)) {
int error = netdev_get_in4(netdev, &in4, NULL);
netdev_close(netdev);
if (!error) {
void
ofproto_sflow_clear(struct ofproto_sflow *os)
{
- struct ofproto_sflow_port *osp;
- unsigned int odp_port;
-
if (os->sflow_agent) {
sfl_agent_release(os->sflow_agent);
os->sflow_agent = NULL;
ofproto_sflow_options_destroy(os->options);
os->options = NULL;
- PORT_ARRAY_FOR_EACH (osp, &os->ports, odp_port) {
- ofproto_sflow_del_port(os, odp_port);
- }
- port_array_clear(&os->ports);
-
/* Turn off sampling to save CPU cycles. */
dpif_set_sflow_probability(os->dpif, 0);
}
ofproto_sflow_destroy(struct ofproto_sflow *os)
{
if (os) {
+ struct ofproto_sflow_port *osp;
+ unsigned int odp_port;
+
ofproto_sflow_clear(os);
+ PORT_ARRAY_FOR_EACH (osp, &os->ports, odp_port) {
+ ofproto_sflow_del_port(os, odp_port);
+ }
port_array_destroy(&os->ports);
free(os);
}
static void
ofproto_sflow_add_sampler(struct ofproto_sflow *os,
- struct ofproto_sflow_port *osp,
- u_int32_t sampling_rate, u_int32_t header_len)
+ struct ofproto_sflow_port *osp)
{
SFLSampler *sampler = sfl_agent_addSampler(os->sflow_agent, &osp->dsi);
- sfl_sampler_set_sFlowFsPacketSamplingRate(sampler, sampling_rate);
- sfl_sampler_set_sFlowFsMaximumHeaderSize(sampler, header_len);
+ sfl_sampler_set_sFlowFsPacketSamplingRate(sampler, os->options->sampling_rate);
+ sfl_sampler_set_sFlowFsMaximumHeaderSize(sampler, os->options->header_len);
sfl_sampler_set_sFlowFsReceiver(sampler, RECEIVER_INDEX);
}
ofproto_sflow_del_port(os, odp_port);
/* Open network device. */
- error = netdev_open(netdev_name, NETDEV_ETH_TYPE_NONE, &netdev);
+ error = netdev_open_default(netdev_name, &netdev);
if (error) {
VLOG_WARN_RL(&rl, "failed to open network device \"%s\": %s",
netdev_name, strerror(error));
SFL_DS_SET(osp->dsi, 0, ifindex, 0);
port_array_set(&os->ports, odp_port, osp);
- /* Add poller. */
+ /* Add poller and sampler. */
if (os->sflow_agent) {
ofproto_sflow_add_poller(os, osp, odp_port);
+ ofproto_sflow_add_sampler(os, osp);
}
}
}
netdev_close(osp->netdev);
free(osp);
- port_array_set(&os->ports, odp_port, NULL);
+ port_array_delete(&os->ports, odp_port);
}
}
unsigned int odp_port;
SFLAddress agentIP;
time_t now;
- int error;
if (!options->targets.n || !options->sampling_rate) {
/* No point in doing any work if there are no targets or nothing to
if (options_changed
|| collectors_count(os->collectors) < options->targets.n) {
collectors_destroy(os->collectors);
- error = collectors_create(&options->targets,
- SFL_DEFAULT_COLLECTOR_PORT, &os->collectors);
+ collectors_create(&options->targets, SFL_DEFAULT_COLLECTOR_PORT,
+ &os->collectors);
if (os->collectors == NULL) {
VLOG_WARN_RL(&rl, "no collectors could be initialized, "
"sFlow disabled");
sfl_agent_release(os->sflow_agent);
}
os->sflow_agent = xcalloc(1, sizeof *os->sflow_agent);
- now = time_now();
+ now = time_wall();
sfl_agent_init(os->sflow_agent,
&agentIP,
options->sub_id,
/* Add samplers and pollers for the currently known ports. */
PORT_ARRAY_FOR_EACH (osp, &os->ports, odp_port) {
- ofproto_sflow_add_sampler(os, osp,
- options->sampling_rate, options->header_len);
+ ofproto_sflow_add_poller(os, osp, odp_port);
+ ofproto_sflow_add_sampler(os, osp);
}
}
/* Get packet payload and extract flow. */
payload.data = (union odp_action *) (actions + n_actions);
payload.size = msg->length - min_size;
- flow_extract(&payload, msg->port, &flow);
+ flow_extract(&payload, 0, msg->port, &flow);
/* Build a flow sample */
memset(&fs, 0, sizeof fs);
hdrElem.tag = SFLFLOW_HEADER;
header = &hdrElem.flowType.header;
header->header_protocol = SFLHEADER_ETHERNET_ISO8023;
- header->frame_length = payload.size;
- header->stripped = 4; /* Ethernet FCS stripped off. */
+ /* The frame_length should include the Ethernet FCS (4 bytes),
+ but it has already been stripped, so we need to add 4 here. */
+ header->frame_length = payload.size + 4;
+ /* Ethernet FCS stripped off. */
+ header->stripped = 4;
header->header_length = MIN(payload.size,
sampler->sFlowFsMaximumHeaderSize);
header->header_bytes = payload.data;
switchElem.tag = SFLFLOW_EX_SWITCH;
switchElem.flowType.sw.src_vlan = ntohs(flow.dl_vlan);
switchElem.flowType.sw.src_priority = -1; /* XXX */
- switchElem.flowType.sw.dst_vlan = -1; /* Filled in correctly below. */
+ /* Initialize the output VLAN and priority to be the same as the input,
+ but these fields can be overriden below if affected by an action. */
+ switchElem.flowType.sw.dst_vlan = switchElem.flowType.sw.src_vlan;
switchElem.flowType.sw.dst_priority = switchElem.flowType.sw.src_priority;
/* Figure out the output ports. */
if (ofproto_sflow_is_enabled(os)) {
time_t now = time_now();
if (now >= os->next_tick) {
- sfl_agent_tick(os->sflow_agent, now);
+ sfl_agent_tick(os->sflow_agent, time_wall());
os->next_tick = now + 1;
}
}
ofproto_sflow_wait(struct ofproto_sflow *os)
{
if (ofproto_sflow_is_enabled(os)) {
- poll_timer_wait(os->next_tick * 1000 - time_msec());
+ poll_timer_wait_until(os->next_tick * 1000LL);
}
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff