Skip to content

Commit

Permalink
Eucanetd use inverted match midonet chain rule for zero icmp type/code
Browse files Browse the repository at this point in the history
  • Loading branch information
@sjones4
sjones4 committed Dec 19, 2019
1 parent bfc1e77 commit e7dfa3f
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 14 deletions.
50 changes: 36 additions & 14 deletions net/euca-to-mido.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4692,16 +4692,32 @@ int parse_mido_chain_rule_protocol(int proto, int icmpType, int icmpCode,
switch (proto) {
case 1: // ICMP
if (icmpType != -1) {
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPS], 64, "jsonjson");
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPS_S], 64, "%d", icmpType);
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPS_E], 64, "%d", icmpType);
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPS_END], 64, "END");
if (icmpType != 0) {
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPS], 64, "jsonjson");
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPS_S], 64, "%d", icmpType);
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPS_E], 64, "%d", icmpType);
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPS_END], 64, "END");
} else {
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPS], 64, "jsonjson");
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPS_S], 64, "1");
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPS_E], 64, "255");
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPS_INV], 64, "true");
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPS_END], 64, "END");
}
}
if (icmpCode != -1) {
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPD], 64, "jsonjson");
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPD_S], 64, "%d", icmpCode);
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPD_E], 64, "%d", icmpCode);
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPD_END], 64, "END");
if (icmpCode != 0) {
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPD], 64, "jsonjson");
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPD_S], 64, "%d", icmpCode);
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPD_E], 64, "%d", icmpCode);
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPD_END], 64, "END");
} else {
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPD], 64, "jsonjson");
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPD_S], 64, "1");
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPD_E], 64, "255");
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPD_INV], 64, "true");
snprintf(parsed_rule->jsonel[MIDO_CRULE_TPD_END], 64, "END");
}
}
break;
case 6: // TCP
Expand Down Expand Up @@ -4765,19 +4781,21 @@ int create_mido_vpc_secgroup_rule(midonet_api_chain *chain, midoname **outname,
rc = mido_create_rule(chain, chain->obj, outname, NULL,
"position", spos, "type", "accept", "tpDst", rule->jsonel[MIDO_CRULE_TPD],
"tpDst:start", rule->jsonel[MIDO_CRULE_TPD_S], "tpDst:end", rule->jsonel[MIDO_CRULE_TPD_E],
"tpDst:END", rule->jsonel[MIDO_CRULE_TPD_END], "tpSrc", rule->jsonel[MIDO_CRULE_TPS],
"tpSrc:start", rule->jsonel[MIDO_CRULE_TPS_S], "tpSrc:end", rule->jsonel[MIDO_CRULE_TPS_E],
"tpSrc:END", rule->jsonel[MIDO_CRULE_TPS_END], "nwProto", rule->jsonel[MIDO_CRULE_PROTO],
"tpDst:END", rule->jsonel[MIDO_CRULE_TPD_END], "invTpDst", rule->jsonel[MIDO_CRULE_TPD_INV],
"tpSrc", rule->jsonel[MIDO_CRULE_TPS], "tpSrc:start", rule->jsonel[MIDO_CRULE_TPS_S],
"tpSrc:end", rule->jsonel[MIDO_CRULE_TPS_E], "tpSrc:END", rule->jsonel[MIDO_CRULE_TPS_END],
"invTpSrc", rule->jsonel[MIDO_CRULE_TPS_INV], "nwProto", rule->jsonel[MIDO_CRULE_PROTO],
"ipAddrGroupDst", rule->jsonel[MIDO_CRULE_GRPUUID], "nwDstAddress", rule->jsonel[MIDO_CRULE_NW],
"nwDstLength", rule->jsonel[MIDO_CRULE_NWLEN], NULL);
break;
case MIDO_RULE_SG_INGRESS:
rc = mido_create_rule(chain, chain->obj, outname, NULL,
"position", spos, "type", "accept", "tpDst", rule->jsonel[MIDO_CRULE_TPD],
"tpDst:start", rule->jsonel[MIDO_CRULE_TPD_S], "tpDst:end", rule->jsonel[MIDO_CRULE_TPD_E],
"tpDst:END", rule->jsonel[MIDO_CRULE_TPD_END], "tpSrc", rule->jsonel[MIDO_CRULE_TPS],
"tpSrc:start", rule->jsonel[MIDO_CRULE_TPS_S], "tpSrc:end", rule->jsonel[MIDO_CRULE_TPS_E],
"tpSrc:END", rule->jsonel[MIDO_CRULE_TPS_END], "nwProto", rule->jsonel[MIDO_CRULE_PROTO],
"tpDst:END", rule->jsonel[MIDO_CRULE_TPD_END], "invTpDst", rule->jsonel[MIDO_CRULE_TPD_INV],
"tpSrc", rule->jsonel[MIDO_CRULE_TPS], "tpSrc:start", rule->jsonel[MIDO_CRULE_TPS_S],
"tpSrc:end", rule->jsonel[MIDO_CRULE_TPS_E], "tpSrc:END", rule->jsonel[MIDO_CRULE_TPS_END],
"invTpSrc", rule->jsonel[MIDO_CRULE_TPS_INV], "nwProto", rule->jsonel[MIDO_CRULE_PROTO],
"ipAddrGroupSrc", rule->jsonel[MIDO_CRULE_GRPUUID], "nwSrcAddress", rule->jsonel[MIDO_CRULE_NW],
"nwSrcLength", rule->jsonel[MIDO_CRULE_NWLEN], NULL);
break;
Expand Down Expand Up @@ -4939,9 +4957,11 @@ int create_mido_vpc_nacl_entry(midonet_api_chain *chain, midoname **outname,
"tpDst", entry->jsonel[MIDO_CRULE_TPD],
"tpDst:start", entry->jsonel[MIDO_CRULE_TPD_S], "tpDst:end", entry->jsonel[MIDO_CRULE_TPD_E],
"tpDst:END", entry->jsonel[MIDO_CRULE_TPD_END],
"invTpDst", entry->jsonel[MIDO_CRULE_TPD_INV],
"tpSrc", entry->jsonel[MIDO_CRULE_TPS],
"tpSrc:start", entry->jsonel[MIDO_CRULE_TPS_S], "tpSrc:end", entry->jsonel[MIDO_CRULE_TPS_E],
"tpSrc:END", entry->jsonel[MIDO_CRULE_TPS_END],
"invTpSrc", entry->jsonel[MIDO_CRULE_TPS_INV],
"nwProto", entry->jsonel[MIDO_CRULE_PROTO],
"nwDstAddress", entry->jsonel[MIDO_CRULE_NW],
"nwDstLength", entry->jsonel[MIDO_CRULE_NWLEN], NULL);
Expand All @@ -4952,9 +4972,11 @@ int create_mido_vpc_nacl_entry(midonet_api_chain *chain, midoname **outname,
"tpDst", entry->jsonel[MIDO_CRULE_TPD],
"tpDst:start", entry->jsonel[MIDO_CRULE_TPD_S], "tpDst:end", entry->jsonel[MIDO_CRULE_TPD_E],
"tpDst:END", entry->jsonel[MIDO_CRULE_TPD_END],
"invTpDst", entry->jsonel[MIDO_CRULE_TPD_INV],
"tpSrc", entry->jsonel[MIDO_CRULE_TPS],
"tpSrc:start", entry->jsonel[MIDO_CRULE_TPS_S], "tpSrc:end", entry->jsonel[MIDO_CRULE_TPS_E],
"tpSrc:END", entry->jsonel[MIDO_CRULE_TPS_END],
"invTpSrc", entry->jsonel[MIDO_CRULE_TPS_INV],
"nwProto", entry->jsonel[MIDO_CRULE_PROTO],
"nwSrcAddress", entry->jsonel[MIDO_CRULE_NW],
"nwSrcLength", entry->jsonel[MIDO_CRULE_NWLEN], NULL);
Expand Down
2 changes: 2 additions & 0 deletions net/midonet-api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,12 @@ enum mido_chain_rule_elements_t {
MIDO_CRULE_TPS,
MIDO_CRULE_TPS_S,
MIDO_CRULE_TPS_E,
MIDO_CRULE_TPS_INV,
MIDO_CRULE_TPS_END,
MIDO_CRULE_TPD,
MIDO_CRULE_TPD_S,
MIDO_CRULE_TPD_E,
MIDO_CRULE_TPD_INV,
MIDO_CRULE_TPD_END,
MIDO_CRULE_GRPUUID,
MIDO_CRULE_END
Expand Down

0 comments on commit e7dfa3f

Please sign in to comment.