git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socket-util: Move sock_errno() to socket-util.
[sliver-openvswitch.git]
/
lib
/
ofp-parse.c
diff --git
a/lib/ofp-parse.c
b/lib/ofp-parse.c
index
5b07d14
..
b254ac6
100644
(file)
--- a/
lib/ofp-parse.c
+++ b/
lib/ofp-parse.c
@@
-212,10
+212,10
@@
parse_output(const char *arg, struct ofpbuf *ofpacts)
struct ofpact_output *output;
output = ofpact_put_OUTPUT(ofpacts);
struct ofpact_output *output;
output = ofpact_put_OUTPUT(ofpacts);
- output->max_len = output->port == OFPP_CONTROLLER ? UINT16_MAX : 0;
if (!ofputil_port_from_string(arg, &output->port)) {
return xasprintf("%s: output to unknown port", arg);
}
if (!ofputil_port_from_string(arg, &output->port)) {
return xasprintf("%s: output to unknown port", arg);
}
+ output->max_len = output->port == OFPP_CONTROLLER ? UINT16_MAX : 0;
return NULL;
}
}
return NULL;
}
}
@@
-639,12
+639,14
@@
parse_named_action(enum ofputil_action_code code,
char *error = NULL;
uint16_t ethertype = 0;
uint16_t vid = 0;
char *error = NULL;
uint16_t ethertype = 0;
uint16_t vid = 0;
- uint8_t tos = 0, ecn, ttl;
+ uint8_t tos = 0;
+ uint8_t ecn = 0;
+ uint8_t ttl = 0;
uint8_t pcp = 0;
switch (code) {
case OFPUTIL_ACTION_INVALID:
uint8_t pcp = 0;
switch (code) {
case OFPUTIL_ACTION_INVALID:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
case OFPUTIL_OFPAT10_OUTPUT:
case OFPUTIL_OFPAT11_OUTPUT:
case OFPUTIL_OFPAT10_OUTPUT:
case OFPUTIL_OFPAT11_OUTPUT:
@@
-765,7
+767,7
@@
parse_named_action(enum ofputil_action_code code,
break;
case OFPUTIL_OFPAT11_DEC_NW_TTL:
break;
case OFPUTIL_OFPAT11_DEC_NW_TTL:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
case OFPUTIL_OFPAT10_SET_TP_SRC:
case OFPUTIL_OFPAT11_SET_TP_SRC:
case OFPUTIL_OFPAT10_SET_TP_SRC:
case OFPUTIL_OFPAT11_SET_TP_SRC:
@@
-833,7
+835,7
@@
parse_named_action(enum ofputil_action_code code,
case OFPUTIL_NXAST_RESUBMIT_TABLE:
case OFPUTIL_NXAST_OUTPUT_REG:
case OFPUTIL_NXAST_DEC_TTL_CNT_IDS:
case OFPUTIL_NXAST_RESUBMIT_TABLE:
case OFPUTIL_NXAST_OUTPUT_REG:
case OFPUTIL_NXAST_DEC_TTL_CNT_IDS:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
case OFPUTIL_NXAST_LEARN:
error = learn_parse(arg, ofpacts);
case OFPUTIL_NXAST_LEARN:
error = learn_parse(arg, ofpacts);
@@
-1021,7
+1023,7
@@
parse_named_instruction(enum ovs_instruction_type type,
switch (type) {
case OVSINST_OFPIT11_APPLY_ACTIONS:
switch (type) {
case OVSINST_OFPIT11_APPLY_ACTIONS:
- NOT_REACHED(); /* This case is handled by str_to_inst_ofpacts() */
+
OVS_
NOT_REACHED(); /* This case is handled by str_to_inst_ofpacts() */
break;
case OVSINST_OFPIT11_WRITE_ACTIONS: {
break;
case OVSINST_OFPIT11_WRITE_ACTIONS: {
@@
-1246,7
+1248,7
@@
parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string,
break;
default:
break;
default:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
match_init_catchall(&fm->match);
}
match_init_catchall(&fm->match);
@@
-1500,7
+1502,7
@@
parse_ofp_meter_mod_str__(struct ofputil_meter_mod *mm, char *string,
break;
default:
break;
default:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
mm->command = command;
}
mm->command = command;
@@
-2146,7
+2148,7
@@
parse_ofp_group_mod_str__(struct ofputil_group_mod *gm, uint16_t command,
break;
default:
break;
default:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
memset(gm, 0, sizeof *gm);
}
memset(gm, 0, sizeof *gm);