}
rewind(pcap);
- snprintf(command, sizeof command, "/usr/sbin/tcpdump -e -n -r /dev/fd/%d 2>/dev/null",
+ snprintf(command, sizeof command, "/usr/sbin/tcpdump -t -e -n -r /dev/fd/%d 2>/dev/null",
fileno(pcap));
tcpdump = popen(command, "r");
fclose(pcap);
case NXAST_NOTE: return -1;
case NXAST_SET_TUNNEL64: return sizeof(struct nx_action_set_tunnel64);
case NXAST_MULTIPATH: return sizeof(struct nx_action_multipath);
+ case NXAST_AUTOPATH: return sizeof (struct nx_action_autopath);
default: return -1;
}
}
static void
ofp_print_nx_action(struct ds *string, const struct nx_action_header *nah)
{
- uint16_t subtype = ntohs(nah->subtype);
+ int subtype = ntohs(nah->subtype);
int required_len = nx_action_len(subtype);
int len = ntohs(nah->len);
const struct nx_action_reg_move *move;
const struct nx_action_reg_load *load;
const struct nx_action_multipath *nam;
+ const struct nx_action_autopath *naa;
switch ((enum nx_action_subtype) subtype) {
case NXAST_RESUBMIT:
multipath_format(nam, string);
return;
+ case NXAST_AUTOPATH:
+ naa = (const struct nx_action_autopath *)nah;
+ ds_put_format(string, "autopath(%u,", ntohl(naa->id));
+ nxm_format_field_bits(string, ntohl(naa->dst),
+ nxm_decode_ofs(naa->ofs_nbits),
+ nxm_decode_n_bits(naa->ofs_nbits));
+ ds_put_char(string, ')');
+ return;
+
case NXAST_SNAT__OBSOLETE:
default:
break;
}
}
- ds_put_format(string, "***unknown Nicira action:%"PRIu16"***", subtype);
+ ds_put_format(string, "***unknown Nicira action:%d***", subtype);
}
static int
memcpy(name, port->name, sizeof name);
for (j = 0; j < sizeof name - 1; j++) {
- if (!isprint(name[j])) {
+ if (!isprint((unsigned char) name[j])) {
break;
}
}
}
static void
-print_ip_netmask(struct ds *string, const char *leader, uint32_t ip,
+print_ip_netmask(struct ds *string, const char *leader, ovs_be32 ip,
uint32_t wild_bits, int verbosity)
{
if (wild_bits >= 32 && verbosity < 2) {
skip_type = false;
}
}
- if (w & NXFW_TUN_ID) {
- ds_put_cstr(&f, "tun_id_wild,");
- }
print_wild(&f, "in_port=", w & OFPFW_IN_PORT, verbosity,
"%d", ntohs(om->in_port));
print_wild(&f, "dl_vlan=", w & OFPFW_DL_VLAN, verbosity,
bool need_priority;
int error;
- error = ofputil_decode_flow_mod(&fm, oh, NXFF_OPENFLOW10);
+ error = ofputil_decode_flow_mod(&fm, oh);
if (error) {
ofp_print_error(s, error);
return;
struct ofputil_flow_removed fr;
int error;
- error = ofputil_decode_flow_removed(&fr, oh, NXFF_OPENFLOW10);
+ error = ofputil_decode_flow_removed(&fr, oh);
if (error) {
ofp_print_error(string, error);
return;
struct flow_stats_request fsr;
int error;
- error = ofputil_decode_flow_stats_request(&fsr, oh, NXFF_OPENFLOW10);
+ error = ofputil_decode_flow_stats_request(&fsr, oh);
if (error) {
ofp_print_error(string, error);
return;
}
static void
-ofp_print_ofpst_flow_reply(struct ds *string, const struct ofp_header *oh,
- int verbosity)
+ofp_print_flow_stats_reply(struct ds *string, const struct ofp_header *oh)
{
- size_t len = ofputil_stats_body_len(oh);
- const char *body = ofputil_stats_body(oh);
- const char *pos = body;
- for (;;) {
- const struct ofp_flow_stats *fs;
- ptrdiff_t bytes_left = body + len - pos;
- size_t length;
+ struct ofpbuf b;
- ds_put_char(string, '\n');
+ ofpbuf_use_const(&b, oh, ntohs(oh->length));
+ for (;;) {
+ struct ofputil_flow_stats fs;
+ int retval;
- if (bytes_left < sizeof *fs) {
- if (bytes_left != 0) {
- ds_put_format(string, " ***%td leftover bytes at end***",
- bytes_left);
+ retval = ofputil_decode_flow_stats_reply(&fs, &b);
+ if (retval) {
+ if (retval != EOF) {
+ ds_put_cstr(string, " ***parse error***");
}
break;
}
- fs = (const void *) pos;
- length = ntohs(fs->length);
- if (length < sizeof *fs) {
- ds_put_format(string, " ***length=%zu shorter than minimum %zu***",
- length, sizeof *fs);
- break;
- } else if (length > bytes_left) {
- ds_put_format(string,
- " ***length=%zu but only %td bytes left***",
- length, bytes_left);
- break;
- } else if ((length - sizeof *fs) % sizeof fs->actions[0]) {
- ds_put_format(string,
- " ***length=%zu has %zu bytes leftover in "
- "final action***",
- length,
- (length - sizeof *fs) % sizeof fs->actions[0]);
- break;
- }
-
- ds_put_format(string, " cookie=0x%"PRIx64", duration=",
- ntohll(get_32aligned_be64(&fs->cookie)));
- ofp_print_duration(string, ntohl(fs->duration_sec),
- ntohl(fs->duration_nsec));
- ds_put_format(string, ", table_id=%"PRIu8", ", fs->table_id);
- ds_put_format(string, "priority=%"PRIu16", ", ntohs(fs->priority));
- ds_put_format(string, "n_packets=%"PRIu64", ",
- ntohll(get_32aligned_be64(&fs->packet_count)));
- ds_put_format(string, "n_bytes=%"PRIu64", ",
- ntohll(get_32aligned_be64(&fs->byte_count)));
- if (fs->idle_timeout != htons(OFP_FLOW_PERMANENT)) {
- ds_put_format(string, "idle_timeout=%"PRIu16",",
- ntohs(fs->idle_timeout));
- }
- if (fs->hard_timeout != htons(OFP_FLOW_PERMANENT)) {
- ds_put_format(string, "hard_timeout=%"PRIu16",",
- ntohs(fs->hard_timeout));
- }
- ofp_print_match(string, &fs->match, verbosity);
- ds_put_char(string, ' ');
- ofp_print_actions(string, fs->actions, length - sizeof *fs);
-
- pos += length;
- }
-}
-
-static void
-ofp_print_nxst_flow_reply(struct ds *string, const struct ofp_header *oh)
-{
- struct ofpbuf b;
-
- ofpbuf_use_const(&b, ofputil_nxstats_body(oh),
- ofputil_nxstats_body_len(oh));
- while (b.size > 0) {
- const struct nx_flow_stats *fs;
- union ofp_action *actions;
- struct cls_rule rule;
- size_t actions_len, n_actions;
- size_t length;
- int match_len;
- int error;
-
ds_put_char(string, '\n');
- fs = ofpbuf_try_pull(&b, sizeof *fs);
- if (!fs) {
- ds_put_format(string, " ***%td leftover bytes at end***", b.size);
- break;
- }
-
- length = ntohs(fs->length);
- if (length < sizeof *fs) {
- ds_put_format(string, " ***nx_flow_stats claims length %zu***",
- length);
- break;
- }
-
- match_len = ntohs(fs->match_len);
- if (match_len > length - sizeof *fs) {
- ds_put_format(string, " ***length=%zu match_len=%d***",
- length, match_len);
- break;
- }
-
ds_put_format(string, " cookie=0x%"PRIx64", duration=",
- ntohll(fs->cookie));
- ofp_print_duration(string, ntohl(fs->duration_sec),
- ntohl(fs->duration_nsec));
- ds_put_format(string, ", table_id=%"PRIu8", ", fs->table_id);
- ds_put_format(string, "n_packets=%"PRIu64", ",
- ntohll(fs->packet_count));
- ds_put_format(string, "n_bytes=%"PRIu64", ", ntohll(fs->byte_count));
- if (fs->idle_timeout != htons(OFP_FLOW_PERMANENT)) {
- ds_put_format(string, "idle_timeout=%"PRIu16",",
- ntohs(fs->idle_timeout));
- }
- if (fs->hard_timeout != htons(OFP_FLOW_PERMANENT)) {
- ds_put_format(string, "hard_timeout=%"PRIu16",",
- ntohs(fs->hard_timeout));
- }
-
- error = nx_pull_match(&b, match_len, ntohs(fs->priority), &rule);
- if (error) {
- ofp_print_error(string, error);
- break;
+ ntohll(fs.cookie));
+ ofp_print_duration(string, fs.duration_sec, fs.duration_nsec);
+ ds_put_format(string, ", table_id=%"PRIu8", ", fs.table_id);
+ ds_put_format(string, "n_packets=%"PRIu64", ", fs.packet_count);
+ ds_put_format(string, "n_bytes=%"PRIu64", ", fs.byte_count);
+ if (fs.idle_timeout != OFP_FLOW_PERMANENT) {
+ ds_put_format(string, "idle_timeout=%"PRIu16",", fs.idle_timeout);
}
-
- actions_len = length - sizeof *fs - ROUND_UP(match_len, 8);
- error = ofputil_pull_actions(&b, actions_len, &actions, &n_actions);
- if (error) {
- ofp_print_error(string, error);
- break;
+ if (fs.hard_timeout != OFP_FLOW_PERMANENT) {
+ ds_put_format(string, "hard_timeout=%"PRIu16",", fs.hard_timeout);
}
- cls_rule_format(&rule, string);
+ cls_rule_format(&fs.rule, string);
ds_put_char(string, ' ');
- ofp_print_actions(string, (const struct ofp_action_header *) actions,
- n_actions * sizeof *actions);
+ ofp_print_actions(string,
+ (const struct ofp_action_header *) fs.actions,
+ fs.n_actions * sizeof *fs.actions);
}
}
}
}
-static void
-ofp_print_nxt_status_message(struct ds *string, const struct ofp_header *oh)
-{
- struct ofpbuf b;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- ofpbuf_pull(&b, sizeof(struct nicira_header));
- ds_put_cstr(string, " \"");
- ds_put_printable(string, b.data, b.size);
- ds_put_char(string, '"');
-}
-
-static void
-ofp_print_nxt_tun_id_from_cookie(struct ds *string,
- const struct nxt_tun_id_cookie *ntic)
-{
- ds_put_format(string, " set=%"PRIu8, ntic->set);
-}
-
static void
ofp_print_nxt_role_message(struct ds *string,
const struct nx_role_request *nrr)
break;
case OFPUTIL_OFPST_FLOW_REPLY:
+ case OFPUTIL_NXST_FLOW_REPLY:
ofp_print_stats_reply(string, oh);
- ofp_print_ofpst_flow_reply(string, oh, verbosity);
+ ofp_print_flow_stats_reply(string, oh);
break;
case OFPUTIL_OFPST_QUEUE_REPLY:
ofp_print_ofpst_aggregate_reply(string, oh);
break;
- case OFPUTIL_NXT_STATUS_REQUEST:
- case OFPUTIL_NXT_STATUS_REPLY:
- ofp_print_nxt_status_message(string, oh);
- break;
-
- case OFPUTIL_NXT_TUN_ID_FROM_COOKIE:
- ofp_print_nxt_tun_id_from_cookie(string, msg);
- break;
-
case OFPUTIL_NXT_ROLE_REQUEST:
case OFPUTIL_NXT_ROLE_REPLY:
ofp_print_nxt_role_message(string, msg);
ofp_print_flow_mod(string, msg, code, verbosity);
break;
- case OFPUTIL_NXST_FLOW_REPLY:
- ofp_print_nxst_flow_reply(string, oh);
- break;
-
case OFPUTIL_NXST_AGGREGATE_REPLY:
ofp_print_stats_reply(string, oh);
ofp_print_nxst_aggregate_reply(string, msg);