From patchwork Sat Sep 12 03:46:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 517070 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 2B08B14012C for ; Sat, 12 Sep 2015 13:47:02 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id E422C22C42E; Fri, 11 Sep 2015 20:46:48 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 397F522C42D for ; Fri, 11 Sep 2015 20:46:48 -0700 (PDT) Received: from bar2.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id 9C4954202F9 for ; Fri, 11 Sep 2015 21:46:47 -0600 (MDT) X-ASG-Debug-ID: 1442029607-03dc5353b524370001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar2.cudamail.com with ESMTP id 13joaXUEaqrgsDXR (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 11 Sep 2015 21:46:47 -0600 (MDT) X-Barracuda-Envelope-From: blp@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mail-pa0-f44.google.com) (209.85.220.44) by mx1-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 12 Sep 2015 03:46:46 -0000 Received-SPF: unknown (mx1-pf2.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.44 Received: by pacfv12 with SMTP id fv12so93127310pac.2 for ; Fri, 11 Sep 2015 20:46:46 -0700 (PDT) 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:in-reply-to :references; bh=vNXdmf0AM9cRZMYwqzVy4ZkjOep1apgD1pOlOZMWMWE=; b=KGnFKbkJWgWgvtIzNkZ+qlpkllGjV0W8LE2byIfc6VQ3V9LpxFbAC+ALL5gNEu7SHl oylG0NdQ4iJIESZsqNlDJksS1U0mvpZK0lSuDeXE/B+GYvQpAv99RbmcTBWJbb66zkz8 fhsPFnB2iavXbZz/4+GiP1W9E1lfKKxJs6H5iTV6ByaH3QCxl2unc2FB5fTnpAjEGspS RWyACPjowh4gaAsB+BVg/l8sIs+HT7cDk3Yfe6IywZhtCXEkQyy/wQ9iY4Wbjo7IIdYd 4nSXeFxA7BWIOLu5CkHMvts/hPqN4OljX+dOcRlxxs3z+kCuszKVmZMfliyZGn+9wYRP z8cQ== X-Gm-Message-State: ALoCoQkQmFXRgZYxMbEO9MnNEjMoAfkUW8j833xgFqrHHSRPkFudE6l0KyHQyR5R4yZNuNNIZYQf X-Received: by 10.66.157.72 with SMTP id wk8mr5050385pab.132.1442029606182; Fri, 11 Sep 2015 20:46:46 -0700 (PDT) Received: from sigabrt.benpfaff.org (173-228-112-165.dsl.dynamic.fusionbroadband.com. [173.228.112.165]) by smtp.gmail.com with ESMTPSA id cn4sm2994105pbc.94.2015.09.11.20.46.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Sep 2015 20:46:45 -0700 (PDT) X-CudaMail-Envelope-Sender: blp@nicira.com X-Barracuda-Apparent-Source-IP: 173.228.112.165 From: Ben Pfaff To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-910094335 X-CudaMail-DTE: 091115 X-CudaMail-Originating-IP: 209.85.220.44 Date: Fri, 11 Sep 2015 20:46:37 -0700 X-ASG-Orig-Subj: [##CM-E2-910094335##][PATCH 3/4] ovn-sbctl: Support SSL for connecting to southbound database. Message-Id: <1442029598-6778-4-git-send-email-blp@nicira.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1442029598-6778-1-git-send-email-blp@nicira.com> References: <1442029598-6778-1-git-send-email-blp@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1442029607 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 3/4] ovn-sbctl: Support SSL for connecting to southbound database. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Eventually we'll want this and it's easy to add, so go ahead and add it now. Signed-off-by: Ben Pfaff Acked-by: Andy Zhou --- ovn/utilities/ovn-sbctl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ovn/utilities/ovn-sbctl.c b/ovn/utilities/ovn-sbctl.c index 1d43504..1104167 100644 --- a/ovn/utilities/ovn-sbctl.c +++ b/ovn/utilities/ovn-sbctl.c @@ -40,6 +40,7 @@ #include "process.h" #include "sset.h" #include "shash.h" +#include "stream-ssl.h" #include "table.h" #include "timeval.h" #include "util.h" @@ -171,6 +172,7 @@ parse_options(int argc, char *argv[], struct shash *local_options) {"options", no_argument, NULL, OPT_OPTIONS}, {"version", no_argument, NULL, 'V'}, VLOG_LONG_OPTIONS, + STREAM_SSL_LONG_OPTIONS, TABLE_LONG_OPTIONS, {NULL, 0, NULL, 0}, }; @@ -255,6 +257,7 @@ parse_options(int argc, char *argv[], struct shash *local_options) VLOG_OPTION_HANDLERS TABLE_OPTION_HANDLERS(&table_style) + STREAM_SSL_OPTION_HANDLERS case '?': exit(EXIT_FAILURE);