{"id":806749,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806749/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20170828192640.19240-2-david.lebrun@uclouvain.be>","date":"2017-08-28T19:26:39","name":"[iproute2,net-next,v2,1/2] iproute: add support for seg6 l2encap mode","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"0bb3ac125a9ba310f35663cd13ffd9d61cc0d181","submitter":{"id":69771,"url":"http://patchwork.ozlabs.org/api/1.0/people/69771/?format=json","name":"David Lebrun","email":"david.lebrun@uclouvain.be"},"delegate":{"id":389,"url":"http://patchwork.ozlabs.org/api/1.0/users/389/?format=json","username":"shemminger","first_name":"stephen","last_name":"hemminger","email":"shemminger@vyatta.com"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170828192640.19240-2-david.lebrun@uclouvain.be/mbox/","series":[{"id":247,"url":"http://patchwork.ozlabs.org/api/1.0/series/247/?format=json","date":"2017-08-28T19:26:38","name":"Add support for seg6 l2encap mode","version":2,"mbox":"http://patchwork.ozlabs.org/series/247/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806749/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tsecure) header.d=uclouvain.be header.i=@uclouvain.be\n\theader.b=\"FPnc+yNA\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xh25f0Vh5z9t2V\n\tfor ;\n\tTue, 29 Aug 2017 05:34:29 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751443AbdH1T01 (ORCPT );\n\tMon, 28 Aug 2017 15:26:27 -0400","from smtp.sgsi.ucl.ac.be ([130.104.5.67]:41841 \"EHLO\n\tsmtp6.sgsi.ucl.ac.be\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751290AbdH1T0S (ORCPT\n\t); Mon, 28 Aug 2017 15:26:18 -0400","from mailboxes.uclouvain.be (mailboxes.uclouvain.be\n\t[130.104.6.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp6.sgsi.ucl.ac.be (Postfix) with ESMTPS id 9684567DA15\n\tfor ; Mon, 28 Aug 2017 21:26:09 +0200 (CEST)","from localhost.localdomain (188.141.97.249) by\n\tucl-mbx04.OASIS.UCLOUVAIN.BE (10.10.10.24) with Microsoft SMTP Server\n\t(TLS) id 15.0.1210.3; Mon, 28 Aug 2017 21:26:09 +0200"],"DKIM-Filter":"OpenDKIM Filter v2.9.2 smtp6.sgsi.ucl.ac.be 9684567DA15","DKIM-Signature":"v=1; a=rsa-sha256; c=simple/simple; d=uclouvain.be;\n\ts=selucl; t=1503948369;\n\tbh=laEj1oxzaDdoI9kFNxjD6OI4G+fxOJk2RFBiXpfRL6g=;\n\th=From:To:CC:Subject:Date:In-Reply-To:References;\n\tb=FPnc+yNAjxokKyCDrE3Ov3YvDE8p3amp0zGKFf1GOr4VFfjRr1g5FUhhcNhMOWfW2\n\tT3qj/QV9MxIKVvwVOwwwOS6q95CvIUYqYpmOfS+dxNW048/DqfiAa/fH2fa8ht7jbT\n\tCV8GmRQ0ZcB3vL3rkdF0+p1YHFBZJVGXbBECW8us=","X-Virus-Status":"Clean","X-Virus-Scanned":"clamav-milter 0.99.2 at smtp-6","From":"David Lebrun ","To":"","CC":"David Lebrun ","Subject":"[PATCH iproute2 net-next v2 1/2] iproute: add support for seg6\n\tl2encap mode","Date":"Mon, 28 Aug 2017 20:26:39 +0100","Message-ID":"<20170828192640.19240-2-david.lebrun@uclouvain.be>","X-Mailer":"git-send-email 2.10.2","In-Reply-To":"<20170828192640.19240-1-david.lebrun@uclouvain.be>","References":"<20170828192640.19240-1-david.lebrun@uclouvain.be>","MIME-Version":"1.0","Content-Type":"text/plain","X-Originating-IP":"[188.141.97.249]","X-ClientProxiedBy":"UCL-CAS03.OASIS.UCLOUVAIN.BE (10.10.10.43) To\n\tucl-mbx04.OASIS.UCLOUVAIN.BE (10.10.10.24)","X-SGSI-Information":"","X-SGSI-MailScanner-ID":"9684567DA15.A209E","X-SGSI-MailScanner":"Found to be clean","X-SGSI-SpamCheck":"n'est pas un polluriel, SpamAssassin (not cached,\n\tscore=-0.1, requis 5, DKIM_SIGNED 0.10, DKIM_VALID -0.10,\n\tDKIM_VALID_AU -0.10)","X-SGSI-From":"david.lebrun@uclouvain.be","X-SGSI-Spam-Status":"No","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"This patch adds support for the L2ENCAP seg6 mode, enabling to encapsulate\nL2 frames within SRv6 packets.\n\nSigned-off-by: David Lebrun \n---\n ip/iproute_lwtunnel.c | 41 ++++++++++++++++++++++++++++++-----------\n 1 file changed, 30 insertions(+), 11 deletions(-)","diff":"diff --git a/ip/iproute_lwtunnel.c b/ip/iproute_lwtunnel.c\nindex 14294c6..02f36ef 100644\n--- a/ip/iproute_lwtunnel.c\n+++ b/ip/iproute_lwtunnel.c\n@@ -110,6 +110,32 @@ static void print_srh(FILE *fp, struct ipv6_sr_hdr *srh)\n \t}\n }\n \n+static const char *seg6_mode_types[] = {\n+\t[SEG6_IPTUN_MODE_INLINE]\t= \"inline\",\n+\t[SEG6_IPTUN_MODE_ENCAP]\t\t= \"encap\",\n+\t[SEG6_IPTUN_MODE_L2ENCAP]\t= \"l2encap\",\n+};\n+\n+static const char *format_seg6mode_type(int mode)\n+{\n+\tif (mode < 0 || mode > ARRAY_SIZE(seg6_mode_types))\n+\t\treturn \"\";\n+\n+\treturn seg6_mode_types[mode];\n+}\n+\n+static int read_seg6mode_type(const char *mode)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < ARRAY_SIZE(seg6_mode_types); i++) {\n+\t\tif (strcmp(mode, seg6_mode_types[i]) == 0)\n+\t\t\treturn i;\n+\t}\n+\n+\treturn -1;\n+}\n+\n static void print_encap_seg6(FILE *fp, struct rtattr *encap)\n {\n \tstruct rtattr *tb[SEG6_IPTUNNEL_MAX+1];\n@@ -121,8 +147,7 @@ static void print_encap_seg6(FILE *fp, struct rtattr *encap)\n \t\treturn;\n \n \ttuninfo = RTA_DATA(tb[SEG6_IPTUNNEL_SRH]);\n-\tfprintf(fp, \"mode %s \",\n-\t\t(tuninfo->mode == SEG6_IPTUN_MODE_ENCAP) ? \"encap\" : \"inline\");\n+\tfprintf(fp, \"mode %s \", format_seg6mode_type(tuninfo->mode));\n \n \tprint_srh(fp, tuninfo->srh);\n }\n@@ -457,11 +482,8 @@ static int parse_encap_seg6(struct rtattr *rta, size_t len, int *argcp,\n \t\t\tNEXT_ARG();\n \t\t\tif (mode_ok++)\n \t\t\t\tduparg2(\"mode\", *argv);\n-\t\t\tif (strcmp(*argv, \"encap\") == 0)\n-\t\t\t\tencap = 1;\n-\t\t\telse if (strcmp(*argv, \"inline\") == 0)\n-\t\t\t\tencap = 0;\n-\t\t\telse\n+\t\t\tencap = read_seg6mode_type(*argv);\n+\t\t\tif (encap < 0)\n \t\t\t\tinvarg(\"\\\"mode\\\" value is invalid\\n\", *argv);\n \t\t} else if (strcmp(*argv, \"segs\") == 0) {\n \t\t\tNEXT_ARG();\n@@ -490,10 +512,7 @@ static int parse_encap_seg6(struct rtattr *rta, size_t len, int *argcp,\n \ttuninfo = malloc(sizeof(*tuninfo) + srhlen);\n \tmemset(tuninfo, 0, sizeof(*tuninfo) + srhlen);\n \n-\tif (encap)\n-\t\ttuninfo->mode = SEG6_IPTUN_MODE_ENCAP;\n-\telse\n-\t\ttuninfo->mode = SEG6_IPTUN_MODE_INLINE;\n+\ttuninfo->mode = encap;\n \n \tmemcpy(tuninfo->srh, srh, srhlen);\n \n","prefixes":["iproute2","net-next","v2","1/2"]}