From patchwork Thu Jul 16 00:06:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roopa Prabhu X-Patchwork-Id: 496018 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2A17814029E for ; Thu, 16 Jul 2015 10:07:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b=cIqUBDBo; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753773AbbGPAHX (ORCPT ); Wed, 15 Jul 2015 20:07:23 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:33716 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753789AbbGPAG7 (ORCPT ); Wed, 15 Jul 2015 20:06:59 -0400 Received: by pdbqm3 with SMTP id qm3so33433124pdb.0 for ; Wed, 15 Jul 2015 17:06:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id; bh=AMusQyagHfFvWf9CZJt7rVDoH1792EjQ+pwcMhblYoM=; b=cIqUBDBobYfOUKKauhOYstBRrlNd6WoZJkzzIQ3nPliBmJxYS+cAMOI6jvgwOTGXMp XBB2Do3NcmgL/vnY0X7Ze0z1tqQKxBVspgSalGuQ7nlZKMmU041Idh/zb5lp/Wl9HtfF Ey4IwV5mjTYCIQ46KW6O85hmHsTJyWTOeP+Gc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=AMusQyagHfFvWf9CZJt7rVDoH1792EjQ+pwcMhblYoM=; b=MScCYGJchVtEItT5UbmL9d3vuZrdnvaKlfo3lPcwEzJvVE8VrXK6jl978d+jgLxcfS XknV5pfo0zOMSuRQqcyuASutN4wkI84KTITOqHLram6D1nUW3nJnB86UeMYiT+WCRmsc bHJBTb7LE6U3RUQjtkIv4qeuzBS5lixl9kFb2755BGM8OCHWgA3CMVC3DUzqiK7VmQWb YPPHDVfmiq80bfmlLzUueO+Ib1aHNcPy8Ya+euDeRir+vfwNABd5cxDHlHBgRpUea2+7 Pp7mThtgSnSjyPmwsTGWu5nY1JkGJb9nsQCW5UKZIaRLmONYHicPkc4QB6y3erWBUYfB 7O+g== X-Gm-Message-State: ALoCoQlgVl0l8haKY01cfwA5Py/swT66x1CDYoVZlK4pk0ePGfPrxMO7Iz9YeaEZxTma9mKKHpfO X-Received: by 10.66.100.162 with SMTP id ez2mr13054670pab.10.1437005219175; Wed, 15 Jul 2015 17:06:59 -0700 (PDT) Received: from localhost.localdomain ([162.248.201.218]) by smtp.googlemail.com with ESMTPSA id yr9sm5863781pab.26.2015.07.15.17.06.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jul 2015 17:06:58 -0700 (PDT) From: Roopa Prabhu X-Google-Original-From: Roopa Prabhu To: stephen@networkplumber.org Cc: netdev@vger.kernel.org Subject: [PATCH net-next iproute2] support batching of ip route get commands Date: Wed, 15 Jul 2015 17:06:36 -0700 Message-Id: <1437005196-8914-1-git-send-email-roopa@cumulusnetworks.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Roopa Prabhu This patch replaces exits with returns in ip route get command handling. This allows batching of ip route get commands. $cat route_get_batch.txt route get 10.0.14.2 route get 12.0.14.2 route get 10.0.14.4 $ip -batch route_get_batch.txt local 10.0.14.2 dev lo src 10.0.14.2 cache 12.0.14.2 via 192.168.0.2 dev eth0 src 192.168.0.15 cache 10.0.14.4 dev dummy0 src 10.0.14.2 cache Signed-off-by: Roopa Prabhu --- ip/iproute.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ip/iproute.c b/ip/iproute.c index 41dea8f..8f49e62 100644 --- a/ip/iproute.c +++ b/ip/iproute.c @@ -1682,15 +1682,15 @@ static int iproute_get(int argc, char **argv) req.n.nlmsg_type = RTM_GETROUTE; if (rtnl_talk(&rth, &req.n, &req.n, sizeof(req)) < 0) - exit(2); + return -2; } if (print_route(NULL, &req.n, (void*)stdout) < 0) { fprintf(stderr, "An error :-)\n"); - exit(1); + return -1; } - exit(0); + return 0; } static int restore_handler(const struct sockaddr_nl *nl,