From patchwork Fri Jun 30 13:21:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 9819589 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 680F8603F2 for ; Fri, 30 Jun 2017 13:21:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56D7E28651 for ; Fri, 30 Jun 2017 13:21:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B5CE28660; Fri, 30 Jun 2017 13:21:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB9FF28665 for ; Fri, 30 Jun 2017 13:21:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751974AbdF3NVb (ORCPT ); Fri, 30 Jun 2017 09:21:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52458 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751560AbdF3NVa (ORCPT ); Fri, 30 Jun 2017 09:21:30 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5B8F183F47; Fri, 30 Jun 2017 13:21:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5B8F183F47 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=stefanha@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 5B8F183F47 Received: from localhost (ovpn-116-222.ams2.redhat.com [10.36.116.222]) by smtp.corp.redhat.com (Postfix) with ESMTP id 096457F83F; Fri, 30 Jun 2017 13:21:27 +0000 (UTC) From: Stefan Hajnoczi To: linux-nfs@vger.kernel.org Cc: Jeff Layton , Abbas Naderi , Steve Dickson , Stefan Hajnoczi Subject: [PATCH nfs-utils v2 02/12] nfs-utils: add AF_VSOCK support to sockaddr.h Date: Fri, 30 Jun 2017 14:21:10 +0100 Message-Id: <20170630132120.31578-3-stefanha@redhat.com> In-Reply-To: <20170630132120.31578-1-stefanha@redhat.com> References: <20170630132120.31578-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 30 Jun 2017 13:21:30 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Stefan Hajnoczi --- support/include/sockaddr.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/support/include/sockaddr.h b/support/include/sockaddr.h index 446b537..0577859 100644 --- a/support/include/sockaddr.h +++ b/support/include/sockaddr.h @@ -31,6 +31,9 @@ #include #include #include +#ifdef AF_VSOCK +#include +#endif /* * This type is for defining buffers that contain network socket @@ -51,6 +54,9 @@ union nfs_sockaddr { struct sockaddr sa; struct sockaddr_in s4; struct sockaddr_in6 s6; +#ifdef AF_VSOCK + struct sockaddr_vm svm; +#endif }; #if SIZEOF_SOCKLEN_T - 0 == 0 @@ -66,6 +72,10 @@ union nfs_sockaddr { #define SIZEOF_SOCKADDR_IN6 SIZEOF_SOCKADDR_UNKNOWN #endif /* !IPV6_SUPPORTED */ +#ifdef AF_VSOCK +#define SIZEOF_SOCKADDR_VM (socklen_t)sizeof(struct sockaddr_vm) +#endif + /** * nfs_sockaddr_length - return the size in bytes of a socket address * @sap: pointer to socket address @@ -81,6 +91,10 @@ nfs_sockaddr_length(const struct sockaddr *sap) return SIZEOF_SOCKADDR_IN; case AF_INET6: return SIZEOF_SOCKADDR_IN6; +#ifdef AF_VSOCK + case AF_VSOCK: + return SIZEOF_SOCKADDR_VM; +#endif /* !AF_VSOCK */ } return SIZEOF_SOCKADDR_UNKNOWN; } @@ -218,6 +232,17 @@ compare_sockaddr6(__attribute__ ((unused)) const struct sockaddr *sa1, } #endif /* !IPV6_SUPPORTED */ +#ifdef AF_VSOCK +static inline _Bool +compare_sockaddr_vsock(const struct sockaddr *sa1, const struct sockaddr *sa2) +{ + const struct sockaddr_vm *svm1 = (const struct sockaddr_vm *)sa1; + const struct sockaddr_vm *svm2 = (const struct sockaddr_vm *)sa2; + + return svm1->svm_cid == svm2->svm_cid; +} +#endif + /** * nfs_compare_sockaddr - compare two socket addresses for equality * @sa1: pointer to a socket address @@ -238,6 +263,10 @@ nfs_compare_sockaddr(const struct sockaddr *sa1, const struct sockaddr *sa2) return compare_sockaddr4(sa1, sa2); case AF_INET6: return compare_sockaddr6(sa1, sa2); +#ifdef AF_VSOCK + case AF_VSOCK: + return compare_sockaddr_vsock(sa1, sa2); +#endif } return false;