#include "timeval.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(sflow)
+VLOG_DEFINE_THIS_MODULE(sflow);
struct ofproto_sflow_port {
struct hmap_node hmap_node; /* In struct ofproto_sflow's "ports" hmap. */
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 {
actions = (const union odp_action *) (hdr + 1);
/* Get packet payload and extract flow. */
- payload.data = (union odp_action *) (actions + n_actions);
- payload.size = msg->length - min_size;
+ ofpbuf_use_const(&payload, actions + n_actions, msg->length - min_size);
flow_extract(&payload, 0, msg->port, &flow);
/* Build a flow sample */
/* Add extended switch element. */
memset(&switchElem, 0, sizeof(switchElem));
switchElem.tag = SFLFLOW_EX_SWITCH;
- switchElem.flowType.sw.src_vlan = ntohs(flow.dl_vlan);
- switchElem.flowType.sw.src_priority = -1; /* XXX */
+ switchElem.flowType.sw.src_vlan = vlan_tci_to_vid(flow.vlan_tci);
+ switchElem.flowType.sw.src_priority = vlan_tci_to_pcp(flow.vlan_tci);
/* 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;