diff options
| author | Justin Pettit <jpettit@nicira.com> | 2015-10-20 22:26:07 -0700 |
|---|---|---|
| committer | Justin Pettit <jpettit@ovn.org> | 2015-11-09 15:01:15 -0800 |
| commit | 47f3b59b06e10b4d351d559cfd034a9147a07070 (patch) | |
| tree | b3553fbf7135db223f2526fae91eeaeb0679d5bf /ovn | |
| parent | 4c20b9f2a79634afd5705377f5865f5ddad1526a (diff) | |
| download | openvswitch-47f3b59b06e10b4d351d559cfd034a9147a07070.tar.gz | |
ovn: Use "ip.ttl--" instead of "ip4.ttl--".
Signed-off-by: Justin Pettit <jpettit@nicira.com>
Acked-by: Russell Bryant <rbryant@redhat.com>
Diffstat (limited to 'ovn')
| -rw-r--r-- | ovn/lib/actions.c | 4 | ||||
| -rw-r--r-- | ovn/northd/ovn-northd.8.xml | 14 | ||||
| -rw-r--r-- | ovn/northd/ovn-northd.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/ovn/lib/actions.c b/ovn/lib/actions.c index ccf97f047..693b1c108 100644 --- a/ovn/lib/actions.c +++ b/ovn/lib/actions.c @@ -247,9 +247,9 @@ parse_actions(struct action_context *ctx) parse_next_action(ctx); } else if (lexer_match_id(ctx->lexer, "output")) { emit_resubmit(ctx, ctx->output_ptable); - } else if (lexer_match_id(ctx->lexer, "ip4.ttl")) { + } else if (lexer_match_id(ctx->lexer, "ip.ttl")) { if (lexer_match(ctx->lexer, LEX_T_DECREMENT)) { - struct expr *e = expr_parse_string("ip4", ctx->symtab, + struct expr *e = expr_parse_string("ip", ctx->symtab, &ctx->error); ctx->prereqs = expr_combine(EXPR_T_AND, ctx->prereqs, e); ofpact_put_DEC_TTL(ctx->ofpacts); diff --git a/ovn/northd/ovn-northd.8.xml b/ovn/northd/ovn-northd.8.xml index 4bd1990b5..6f0a420a1 100644 --- a/ovn/northd/ovn-northd.8.xml +++ b/ovn/northd/ovn-northd.8.xml @@ -338,7 +338,7 @@ <pre> ip4.dst = ip4.src; ip4.src = <var>S</var>; -ip4.ttl = 255; +ip.ttl = 255; icmp4.type = 0; next; </pre> @@ -460,7 +460,7 @@ output; <p> ICMP time exceeded. For each router port <var>P</var>, whose IP address is <var>A</var>, a priority-40 flow with match <code>inport - == <var>P</var> && ip4.ttl == {0, 1} && + == <var>P</var> && ip.ttl == {0, 1} && !ip.later_frag</code> matches packets whose TTL has expired, with the following actions to send an ICMP time exceeded reply: </p> @@ -471,7 +471,7 @@ icmp4 { icmp4.code = 0; /* TTL exceeded in transit. */ ip4.dst = ip4.src; ip4.src = <var>A</var>; - ip4.ttl = 255; + ip.ttl = 255; next; }; </pre> @@ -482,7 +482,7 @@ icmp4 { </li> <li> - TTL discard. A priority-30 flow with match <code>ip4.ttl == {0, + TTL discard. A priority-30 flow with match <code>ip.ttl == {0, 1}</code> and actions <code>drop;</code> drops other packets whose TTL has expired, that should not receive a ICMP error reply (i.e. fragments with nonzero offset). @@ -519,13 +519,13 @@ icmp4 { </p> <pre> -ip4.ttl--; +ip.ttl--; reg0 = <var>G</var>; next; </pre> <p> - (Ingress table 1 already verified that <code>ip4.ttl--;</code> will + (Ingress table 1 already verified that <code>ip.ttl--;</code> will not yield a TTL exceeded error.) </p> @@ -549,7 +549,7 @@ icmp4 { icmp4.code = 0; /* Network unreachable. */ ip4.dst = ip4.src; ip4.src = <var>A</var>; - ip4.ttl = 255; + ip.ttl = 255; next(2); }; </pre> diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index b196837f1..c7d56fef1 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -1272,7 +1272,7 @@ add_route(struct hmap *lflows, struct ovn_datapath *od, IP_ARGS(network), IP_ARGS(mask)); struct ds actions = DS_EMPTY_INITIALIZER; - ds_put_cstr(&actions, "ip4.ttl--; reg0 = "); + ds_put_cstr(&actions, "ip.ttl--; reg0 = "); if (gateway) { ds_put_format(&actions, IP_FMT, IP_ARGS(gateway)); } else { |