X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-print.c;h=926531ec4d4fa856120f8f6ca5e55b0b2a617b82;hb=8d9f3d567e3863f195959828fa20b5d2ed6cbbea;hp=1e0f0aa09ddb35d140f506b9a799d4864b4e6361;hpb=a14bc59fb8f27db193d74662dc9c5cb8237177ef;p=openvswitch diff --git a/lib/ofp-print.c b/lib/ofp-print.c index 1e0f0aa0..926531ec 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,8 +37,6 @@ #include "util.h" static void ofp_print_port_name(struct ds *string, uint16_t port); -static void ofp_print_match(struct ds *, const struct ofp_match *, - int verbosity); /* Returns a string that represents the contents of the Ethernet frame in the * 'len' bytes starting at 'data' to 'stream' as output by tcpdump. @@ -49,7 +47,7 @@ static void ofp_print_match(struct ds *, const struct ofp_match *, * * This starts and kills a tcpdump subprocess so it's quite expensive. */ char * -ofp_packet_to_string(const void *data, size_t len, size_t total_len UNUSED) +ofp_packet_to_string(const void *data, size_t len, size_t total_len OVS_UNUSED) { struct ds ds = DS_EMPTY_INITIALIZER; struct ofpbuf buf; @@ -245,6 +243,10 @@ ofp_print_action(struct ds *string, const struct ofp_action_header *ah, sizeof(struct ofp_action_nw_addr), sizeof(struct ofp_action_nw_addr), }, + [OFPAT_SET_NW_TOS] = { + sizeof(struct ofp_action_nw_tos), + sizeof(struct ofp_action_nw_tos), + }, [OFPAT_SET_TP_SRC] = { sizeof(struct ofp_action_tp_port), sizeof(struct ofp_action_tp_port), @@ -345,6 +347,12 @@ ofp_print_action(struct ds *string, const struct ofp_action_header *ah, break; } + case OFPAT_SET_NW_TOS: { + struct ofp_action_nw_tos *nt = (struct ofp_action_nw_tos *)ah; + ds_put_format(string, "mod_nw_tos:%d", nt->nw_tos); + break; + } + case OFPAT_SET_TP_SRC: { struct ofp_action_tp_port *ta = (struct ofp_action_tp_port *)ah; ds_put_format(string, "mod_tp_src:%d", ntohs(ta->tp_port)); @@ -380,7 +388,7 @@ ofp_print_action(struct ds *string, const struct ofp_action_header *ah, return len; } -static void +void ofp_print_actions(struct ds *string, const struct ofp_action_header *action, size_t actions_len) { @@ -537,7 +545,7 @@ ofp_print_phy_port(struct ds *string, const struct ofp_phy_port *port) * 'string' at the given 'verbosity' level. */ static void ofp_print_switch_features(struct ds *string, const void *oh, size_t len, - int verbosity UNUSED) + int verbosity OVS_UNUSED) { const struct ofp_switch_features *osf = oh; struct ofp_phy_port *port_list; @@ -567,17 +575,13 @@ ofp_print_switch_features(struct ds *string, const void *oh, size_t len, /* Pretty-print the struct ofp_switch_config of 'len' bytes at 'oh' to 'string' * at the given 'verbosity' level. */ static void -ofp_print_switch_config(struct ds *string, const void *oh, size_t len UNUSED, - int verbosity UNUSED) +ofp_print_switch_config(struct ds *string, const void *oh, + size_t len OVS_UNUSED, int verbosity OVS_UNUSED) { const struct ofp_switch_config *osc = oh; uint16_t flags; flags = ntohs(osc->flags); - if (flags & OFPC_SEND_FLOW_EXP) { - flags &= ~OFPC_SEND_FLOW_EXP; - ds_put_format(string, " (sending flow expirations)"); - } if (flags) { ds_put_format(string, " ***unknown flags 0x%04"PRIx16"***", flags); } @@ -627,7 +631,7 @@ print_ip_netmask(struct ds *string, const char *leader, uint32_t ip, ds_put_char(string, ','); } -static void +void ofp_print_match(struct ds *f, const struct ofp_match *om, int verbosity) { char *s = ofp_match_to_string(om, verbosity); @@ -671,6 +675,8 @@ ofp_match_to_string(const struct ofp_match *om, int verbosity) "%d", ntohs(om->in_port)); print_wild(&f, "dl_vlan=", w & OFPFW_DL_VLAN, verbosity, "0x%04x", ntohs(om->dl_vlan)); + print_wild(&f, "dl_vlan_pcp=", w & OFPFW_DL_VLAN_PCP, verbosity, + "%d", om->dl_vlan_pcp); print_wild(&f, "dl_src=", w & OFPFW_DL_SRC, verbosity, ETH_ADDR_FMT, ETH_ADDR_ARGS(om->dl_src)); print_wild(&f, "dl_dst=", w & OFPFW_DL_DST, verbosity, @@ -729,46 +735,50 @@ ofp_print_flow_mod(struct ds *string, const void *oh, size_t len, default: ds_put_format(string, " cmd:%d ", ntohs(ofm->command)); } - ds_put_format(string, "idle:%d hard:%d pri:%d buf:%#x", + ds_put_format(string, "idle:%d hard:%d pri:%d buf:%#x flags:%"PRIx16" ", ntohs(ofm->idle_timeout), ntohs(ofm->hard_timeout), ofm->match.wildcards ? ntohs(ofm->priority) : (uint16_t)-1, - ntohl(ofm->buffer_id)); + ntohl(ofm->buffer_id), ntohs(ofm->flags)); ofp_print_actions(string, ofm->actions, len - offsetof(struct ofp_flow_mod, actions)); ds_put_char(string, '\n'); } -/* Pretty-print the OFPT_FLOW_EXPIRED packet of 'len' bytes at 'oh' to 'string' +/* Pretty-print the OFPT_FLOW_REMOVED packet of 'len' bytes at 'oh' to 'string' * at the given 'verbosity' level. */ static void -ofp_print_flow_expired(struct ds *string, const void *oh, size_t len UNUSED, - int verbosity) +ofp_print_flow_removed(struct ds *string, const void *oh, + size_t len OVS_UNUSED, int verbosity) { - const struct ofp_flow_expired *ofe = oh; + const struct ofp_flow_removed *ofr = oh; - ofp_print_match(string, &ofe->match, verbosity); + ofp_print_match(string, &ofr->match, verbosity); ds_put_cstr(string, " reason="); - switch (ofe->reason) { - case OFPER_IDLE_TIMEOUT: + switch (ofr->reason) { + case OFPRR_IDLE_TIMEOUT: ds_put_cstr(string, "idle"); break; - case OFPER_HARD_TIMEOUT: + case OFPRR_HARD_TIMEOUT: ds_put_cstr(string, "hard"); break; + case OFPRR_DELETE: + ds_put_cstr(string, "delete"); + break; default: - ds_put_format(string, "**%"PRIu8"**", ofe->reason); + ds_put_format(string, "**%"PRIu8"**", ofr->reason); break; } ds_put_format(string, - " pri%"PRIu16" secs%"PRIu32" pkts%"PRIu64" bytes%"PRIu64"\n", - ofe->match.wildcards ? ntohs(ofe->priority) : (uint16_t)-1, - ntohl(ofe->duration), ntohll(ofe->packet_count), - ntohll(ofe->byte_count)); + " pri%"PRIu16" secs%"PRIu32" idle%"PRIu16" pkts%"PRIu64 + " bytes%"PRIu64"\n", + ofr->match.wildcards ? ntohs(ofr->priority) : (uint16_t)-1, + ntohl(ofr->duration), ntohs(ofr->idle_timeout), + ntohll(ofr->packet_count), ntohll(ofr->byte_count)); } static void -ofp_print_port_mod(struct ds *string, const void *oh, size_t len UNUSED, - int verbosity UNUSED) +ofp_print_port_mod(struct ds *string, const void *oh, size_t len OVS_UNUSED, + int verbosity OVS_UNUSED) { const struct ofp_port_mod *opm = oh; @@ -794,12 +804,18 @@ static const struct error_type error_types[] = { #define ERROR_CODE(TYPE, CODE) {TYPE, CODE, #CODE} ERROR_TYPE(OFPET_HELLO_FAILED), ERROR_CODE(OFPET_HELLO_FAILED, OFPHFC_INCOMPATIBLE), + ERROR_CODE(OFPET_HELLO_FAILED, OFPHFC_EPERM), ERROR_TYPE(OFPET_BAD_REQUEST), ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_VERSION), ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_TYPE), ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_STAT), - ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_VERSION), + ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_VENDOR), + ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_SUBTYPE), + ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_EPERM), + ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN), + ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BUFFER_EMPTY), + ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BUFFER_UNKNOWN), ERROR_TYPE(OFPET_BAD_ACTION), ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_TYPE), @@ -807,9 +823,20 @@ static const struct error_type error_types[] = { ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_VENDOR), ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_VENDOR_TYPE), ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_OUT_PORT), + ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_ARGUMENT), + ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_EPERM), + ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_TOO_MANY), ERROR_TYPE(OFPET_FLOW_MOD_FAILED), - ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_ALL_TABLES_FULL) + ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_ALL_TABLES_FULL), + ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_OVERLAP), + ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_EPERM), + ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_BAD_EMERG_TIMEOUT), + ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_BAD_COMMAND), + + ERROR_TYPE(OFPET_PORT_MOD_FAILED), + ERROR_CODE(OFPET_PORT_MOD_FAILED, OFPPMFC_BAD_PORT), + ERROR_CODE(OFPET_PORT_MOD_FAILED, OFPPMFC_BAD_HW_ADDR) }; #define N_ERROR_TYPES ARRAY_SIZE(error_types) @@ -843,7 +870,7 @@ lookup_error_code(int type, int code) * at the given 'verbosity' level. */ static void ofp_print_error_msg(struct ds *string, const void *oh, size_t len, - int verbosity UNUSED) + int verbosity OVS_UNUSED) { const struct ofp_error_msg *oem = oh; int type = ntohs(oem->type); @@ -874,8 +901,8 @@ ofp_print_error_msg(struct ds *string, const void *oh, size_t len, /* Pretty-print the OFPT_PORT_STATUS packet of 'len' bytes at 'oh' to 'string' * at the given 'verbosity' level. */ static void -ofp_print_port_status(struct ds *string, const void *oh, size_t len UNUSED, - int verbosity UNUSED) +ofp_print_port_status(struct ds *string, const void *oh, size_t len OVS_UNUSED, + int verbosity OVS_UNUSED) { const struct ofp_port_status *ops = oh; @@ -891,8 +918,8 @@ ofp_print_port_status(struct ds *string, const void *oh, size_t len UNUSED, } static void -ofp_desc_stats_reply(struct ds *string, const void *body, size_t len UNUSED, - int verbosity UNUSED) +ofp_desc_stats_reply(struct ds *string, const void *body, + size_t len OVS_UNUSED, int verbosity OVS_UNUSED) { const struct ofp_desc_stats *ods = body; @@ -903,8 +930,8 @@ ofp_desc_stats_reply(struct ds *string, const void *body, size_t len UNUSED, } static void -ofp_flow_stats_request(struct ds *string, const void *oh, size_t len UNUSED, - int verbosity) +ofp_flow_stats_request(struct ds *string, const void *oh, + size_t len OVS_UNUSED, int verbosity) { const struct ofp_flow_stats_request *fsr = oh; @@ -981,7 +1008,7 @@ ofp_flow_stats_reply(struct ds *string, const void *body_, size_t len, static void ofp_aggregate_stats_request(struct ds *string, const void *oh, - size_t len UNUSED, int verbosity) + size_t len OVS_UNUSED, int verbosity) { const struct ofp_aggregate_stats_request *asr = oh; @@ -996,7 +1023,7 @@ ofp_aggregate_stats_request(struct ds *string, const void *oh, static void ofp_aggregate_stats_reply(struct ds *string, const void *body_, - size_t len UNUSED, int verbosity UNUSED) + size_t len OVS_UNUSED, int verbosity OVS_UNUSED) { const struct ofp_aggregate_stats_reply *asr = body_; @@ -1083,7 +1110,7 @@ ofp_table_stats_reply(struct ds *string, const void *body, size_t len, static void vendor_stat(struct ds *string, const void *body, size_t len, - int verbosity UNUSED) + int verbosity OVS_UNUSED) { ds_put_format(string, " vendor=%08"PRIx32, ntohl(*(uint32_t *) body)); ds_put_format(string, " %zu bytes additional data", @@ -1300,10 +1327,10 @@ static const struct openflow_packet packets[] = { ofp_print_flow_mod, }, { - OFPT_FLOW_EXPIRED, - "flow_expired", - sizeof (struct ofp_flow_expired), - ofp_print_flow_expired, + OFPT_FLOW_REMOVED, + "flow_removed", + sizeof (struct ofp_flow_removed), + ofp_print_flow_removed, }, { OFPT_PORT_MOD,