Re: [PATCH/RFC iproute2 2/3] iptunnel: add support for mpls/ip to sit tunnels

[David Ahern <dsa@cumulusnetworks.com>]

On 7/6/16 12:23 PM, Simon Horman wrote:
> Signed-off-by: Simon Horman <simon.horman@netronome.com>
> ---
>  ip/link_iptnl.c       | 12 +++++++++++-
>  ip/tunnel.c           | 10 ++++++++++
>  man/man8/ip-link.8.in |  9 +++++----
>  3 files changed, 26 insertions(+), 5 deletions(-)
>
> diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
> index 8411a6a00a1b..34e4625b4335 100644
> --- a/ip/link_iptnl.c
> +++ b/ip/link_iptnl.c
> @@ -23,6 +23,13 @@
>  #include "ip_common.h"
>  #include "tunnel.h"
>
> +/* This should be in ip.h but it might not be.
> + * What to do?
> + */
> +#ifndef IPPROTO_MPLS
> +#define IPPROTO_MPLS 137 /* RFC 4023 */
> +#endif
> +

This is defined in iproute2's copy of linux/in.h


>  static void print_usage(FILE *f, int sit)
>  {
>  	fprintf(f, "Usage: ip link { add | set | change | replace | del } NAME\n");
> @@ -33,7 +40,7 @@ static void print_usage(FILE *f, int sit)
>  	fprintf(f, "          [ encap-sport PORT ] [ encap-dport PORT ]\n");
>  	fprintf(f, "          [ [no]encap-csum ] [ [no]encap-csum6 ] [ [no]encap-remcsum ]\n");
>  	if (sit) {
> -		fprintf(f, "          [ mode { ip6ip | ipip | any } ]\n");
> +		fprintf(f, "          [ mode { ip6ip | ipip | mplsip | any } ]\n");
>  		fprintf(f, "          [ isatap ]\n");
>  	}
>  	fprintf(f, "\n");
> @@ -222,6 +229,9 @@ get_failed:
>  				 strcmp(*argv, "ipip") == 0 ||
>  				 strcmp(*argv, "ip4ip4") == 0)
>  				proto = IPPROTO_IPIP;
> +			else if (strcmp(*argv, "mpls/ipv4") == 0 ||
> +				   strcmp(*argv, "mplsip") == 0)
> +				proto = IPPROTO_MPLS;
>  			else if (strcmp(*argv, "any/ipv4") == 0 ||
>  				 strcmp(*argv, "any") == 0)
>  				proto = 0;
> diff --git a/ip/tunnel.c b/ip/tunnel.c
> index 7956d71aa733..760fa18a5be6 100644
> --- a/ip/tunnel.c
> +++ b/ip/tunnel.c
> @@ -37,6 +37,13 @@
>  #include "utils.h"
>  #include "tunnel.h"
>
> +/* This should be in ip.h but it might not be.
> + * What to do?
> + */
> +#ifndef IPPROTO_MPLS
> +#define IPPROTO_MPLS 137 /* RFC 4023 */
> +#endif

ditto

David