From patchwork Fri Apr 13 17:26:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 898044 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40N4Zn6s4jz9s0t for ; Sat, 14 Apr 2018 03:31:45 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E9913E11; Fri, 13 Apr 2018 17:27:20 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 1C1A3DE0 for ; Fri, 13 Apr 2018 17:27:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 3BA1767D for ; Fri, 13 Apr 2018 17:27:17 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id DC5B3240003; Fri, 13 Apr 2018 19:27:15 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Fri, 13 Apr 2018 10:26:55 -0700 Message-Id: <20180413172655.31638-11-blp@ovn.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180413172655.31638-1-blp@ovn.org> References: <20180413172655.31638-1-blp@ovn.org> X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 11/11] ovn-nbctl: Use common code for sockaddr_storage. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org This better reuses existing code. Signed-off-by: Ben Pfaff --- ovn/utilities/ovn-nbctl.c | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c index 85d4d3534b54..5c18161fe1c2 100644 --- a/ovn/utilities/ovn-nbctl.c +++ b/ovn/utilities/ovn-nbctl.c @@ -1782,7 +1782,6 @@ nbctl_lb_add(struct ctl_context *ctx) const char *lb_proto; bool is_update_proto = false; - bool is_vip_with_port = true; if (ctx->argc == 4) { /* Default protocol. */ @@ -1803,38 +1802,17 @@ nbctl_lb_add(struct ctl_context *ctx) "and a port number with : as a separator).", lb_vip); } - char lb_vip_normalized[INET6_ADDRSTRLEN + 8]; - char normalized_ip[INET6_ADDRSTRLEN]; - if (ss_vip.ss_family == AF_INET) { - struct sockaddr_in *sin = ALIGNED_CAST(struct sockaddr_in *, &ss_vip); - inet_ntop(AF_INET, &sin->sin_addr, normalized_ip, - sizeof normalized_ip); - if (sin->sin_port) { - is_vip_with_port = true; - snprintf(lb_vip_normalized, sizeof lb_vip_normalized, "%s:%d", - normalized_ip, ntohs(sin->sin_port)); - } else { - is_vip_with_port = false; - ovs_strlcpy(lb_vip_normalized, normalized_ip, - sizeof lb_vip_normalized); - } + struct ds lb_vip_normalized_ds = DS_EMPTY_INITIALIZER; + uint16_t lb_vip_port = ss_get_port(&ss_vip); + if (lb_vip_port) { + ss_format_address(&ss_vip, &lb_vip_normalized_ds); + ds_put_format(&lb_vip_normalized_ds, ":%d", lb_vip_port); } else { - struct sockaddr_in6 *sin6 = ALIGNED_CAST(struct sockaddr_in6 *, - &ss_vip); - inet_ntop(AF_INET6, &sin6->sin6_addr, normalized_ip, - sizeof normalized_ip); - if (sin6->sin6_port) { - is_vip_with_port = true; - snprintf(lb_vip_normalized, sizeof lb_vip_normalized, "[%s]:%d", - normalized_ip, ntohs(sin6->sin6_port)); - } else { - is_vip_with_port = false; - ovs_strlcpy(lb_vip_normalized, normalized_ip, - sizeof lb_vip_normalized); - } + ss_format_address_nobracks(&ss_vip, &lb_vip_normalized_ds); } + const char *lb_vip_normalized = ds_cstr(&lb_vip_normalized_ds); - if (!is_vip_with_port && is_update_proto) { + if (!lb_vip_port && is_update_proto) { ctl_fatal("Protocol is unnecessary when no port of vip " "is given."); } @@ -1845,7 +1823,7 @@ nbctl_lb_add(struct ctl_context *ctx) token != NULL; token = strtok_r(NULL, ",", &save_ptr)) { struct sockaddr_storage ss_dst; - if (is_vip_with_port) { + if (lb_vip_port) { if (!inet_parse_active(token, -1, &ss_dst)) { ctl_fatal("%s: should be an IP address and a port " "number with : as a separator.", token); @@ -1892,6 +1870,7 @@ nbctl_lb_add(struct ctl_context *ctx) nbrec_load_balancer_verify_vips(lb); nbrec_load_balancer_set_vips(lb, &lb->vips); ds_destroy(&lb_ips_new); + ds_destroy(&lb_vip_normalized_ds); return; } } @@ -1904,6 +1883,8 @@ nbctl_lb_add(struct ctl_context *ctx) lb_vip_normalized, ds_cstr(&lb_ips_new)); nbrec_load_balancer_set_vips(lb, &lb->vips); ds_destroy(&lb_ips_new); + + ds_destroy(&lb_vip_normalized_ds); } static void