From patchwork Wed Mar 16 18:52:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Claudi X-Patchwork-Id: 12783042 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B80CC433F5 for ; Wed, 16 Mar 2022 18:53:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350919AbiCPSya (ORCPT ); Wed, 16 Mar 2022 14:54:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347174AbiCPSy1 (ORCPT ); Wed, 16 Mar 2022 14:54:27 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 94D7117AAE for ; Wed, 16 Mar 2022 11:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647456791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BFYQgbUaK1aZg3cOzI5aHCcCLIOT7GBuzvxqyh4ivpo=; b=PpMogZtJ4czyd7AnlZdk//P2QNOG4BXiyp+3+uEI//fUhqk9X5gp3A2FzPYgAUC2Vv36c0 Uo8M7ZTB4E6xWt+TrlrZ4FPz0YbMHYgSuQ74V1I2ZDt6eBWPYh1x5NjNqBkE9a7+x2H/5b RytRwgq6JXrbW5EVRrWLbjvdV+knnpE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-595-EW34B9qROeu0PKX6vMYMcA-1; Wed, 16 Mar 2022 14:53:10 -0400 X-MC-Unique: EW34B9qROeu0PKX6vMYMcA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2E5E5101AA49; Wed, 16 Mar 2022 18:53:10 +0000 (UTC) Received: from renaissance-vector.redhat.com (unknown [10.39.195.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3465055431F; Wed, 16 Mar 2022 18:53:09 +0000 (UTC) From: Andrea Claudi To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, dsahern@gmail.com Subject: [PATCH iproute2-next 1/2] configure: add check_libtirpc() Date: Wed, 16 Mar 2022 19:52:13 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com This patch adds a configure function to check if libtirpc is installed on the build system. If this is the case, it makes iproute2 to compile with libtirpc support. Signed-off-by: Andrea Claudi --- configure | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/configure b/configure index 8ddff43c..440facb7 100755 --- a/configure +++ b/configure @@ -395,6 +395,19 @@ check_selinux() fi } +check_tirpc() +{ + if ${PKG_CONFIG} libtirpc --exists; then + echo "HAVE_RPC:=y" >>$CONFIG + echo "yes" + + echo 'LDLIBS +=' `${PKG_CONFIG} --libs libtirpc` >>$CONFIG + echo 'CFLAGS += -DHAVE_RPC' `${PKG_CONFIG} --cflags libtirpc` >>$CONFIG + else + echo "no" + fi +} + check_mnl() { if ${PKG_CONFIG} libmnl --exists; then @@ -600,6 +613,9 @@ check_name_to_handle_at echo -n "SELinux support: " check_selinux +echo -n "libtirpc support: " +check_tirpc + echo -n "libbpf support: " check_libbpf From patchwork Wed Mar 16 18:52:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Claudi X-Patchwork-Id: 12783043 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBA6BC433EF for ; Wed, 16 Mar 2022 18:53:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351348AbiCPSyb (ORCPT ); Wed, 16 Mar 2022 14:54:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347174AbiCPSya (ORCPT ); Wed, 16 Mar 2022 14:54:30 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 02B6017ABF for ; Wed, 16 Mar 2022 11:53:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647456795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X6zGMC3nbwZW3aXejynoj44csXVgO7AoCYMrADM6mcs=; b=cgf7ysBpD6wMHMKrW6yfy5cFWYT7r9lFWO84o8d+ZzsUKykRpSWshqGwioxhyY/oACUPKJ Cte0k3UIl34MWQwe4HB3WQ1zEbFVZ+9b8iO4BtxUFcXGeq3i9cG7OlLcnPsD8MU8CdWv3+ 3j2AtojCNkl3PBAPg5PXVs8uxRxkpfo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-349-vHM-tj4ZPGG6nBRXUsy5hA-1; Wed, 16 Mar 2022 14:53:11 -0400 X-MC-Unique: vHM-tj4ZPGG6nBRXUsy5hA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7A2BE82A682; Wed, 16 Mar 2022 18:53:11 +0000 (UTC) Received: from renaissance-vector.redhat.com (unknown [10.39.195.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87392434823; Wed, 16 Mar 2022 18:53:10 +0000 (UTC) From: Andrea Claudi To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, dsahern@gmail.com Subject: [PATCH iproute2-next 2/2] ss: remove an implicit dependency on rpcinfo Date: Wed, 16 Mar 2022 19:52:14 +0100 Message-Id: <0255344054d5251c29cdcb6d3bfa404c3c39609b.1647455133.git.aclaudi@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com ss uses rpcinfo to get info about rpc services socket. This makes it dependent on a tool not included in iproute2, and makes it impossible to get info on rpc sockets if rpcinfo is not installed. This reworks init_service_resolver() to use libtirpc, thus avoiding the implicity dependency on rpcinfo. Moreover, this also makes it possible to display info about ipv6 rpc socket that are not included in the rpcinfo -p output. For example, before this patch: $ ss -rtap LISTEN 0 5 localhost:ipp [::]:* users:(("cupsd",pid=1600,fd=9)) LISTEN 0 64 [::]:34265 [::]:* LISTEN 0 64 [::]:rpc.nfs_acl [::]:* LISTEN 0 128 [::]:42253 [::]:* users:(("rpc.statd",pid=146164,fd=12)) After this patch: $ ss -rtap LISTEN 0 5 localhost:ipp [::]:* users:(("cupsd",pid=1600,fd=9)) LISTEN 0 64 [::]:rpc.nlockmgr [::]:* LISTEN 0 64 [::]:rpc.nfs_acl [::]:* LISTEN 0 128 [::]:rpc.status [::]:* users:(("rpc.statd",pid=146164,fd=12)) Signed-off-by: Andrea Claudi --- misc/ss.c | 93 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 73 insertions(+), 20 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index 5e7e84ee..4b3ca9c4 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -55,6 +55,11 @@ #include #include +#if HAVE_RPC +#include +#include +#endif + /* AF_VSOCK/PF_VSOCK is only provided since glibc 2.18 */ #ifndef PF_VSOCK #define PF_VSOCK 40 @@ -192,8 +197,12 @@ static struct { } buffer; static const char *TCP_PROTO = "tcp"; -static const char *SCTP_PROTO = "sctp"; static const char *UDP_PROTO = "udp"; +#ifdef HAVE_RPC +static const char *TCP6_PROTO = "tcp6"; +static const char *UDP6_PROTO = "udp6"; +static const char *SCTP_PROTO = "sctp"; +#endif static const char *RAW_PROTO = "raw"; static const char *dg_proto; @@ -1479,45 +1488,87 @@ struct scache { static struct scache *rlist; +#ifdef HAVE_RPC +static CLIENT *rpc_client_create(rpcprog_t prog, rpcvers_t vers) +{ + struct netbuf nbuf; + struct sockaddr_un saddr; + int sock; + + memset(&saddr, 0, sizeof(saddr)); + sock = socket(AF_LOCAL, SOCK_STREAM, 0); + if (sock < 0) + return NULL; + + saddr.sun_family = AF_LOCAL; + strcpy(saddr.sun_path, _PATH_RPCBINDSOCK); + nbuf.len = SUN_LEN(&saddr); + nbuf.maxlen = sizeof(struct sockaddr_un); + nbuf.buf = &saddr; + + return clnt_vc_create(sock, &nbuf, prog, vers, 0, 0); +} + static void init_service_resolver(void) { - char buf[128]; - FILE *fp = popen("/usr/sbin/rpcinfo -p 2>/dev/null", "r"); + struct rpcblist *rhead = NULL; + struct timeval timeout; + struct rpcent *rpc; + enum clnt_stat res; + CLIENT *client; - if (!fp) + timeout.tv_sec = 5; + timeout.tv_usec = 0; + + client = rpc_client_create(PMAPPROG, RPCBVERS4); + if (!client) return; - if (!fgets(buf, sizeof(buf), fp)) { - pclose(fp); + res = clnt_call(client, RPCBPROC_DUMP, (xdrproc_t)xdr_void, NULL, + (xdrproc_t)xdr_rpcblist_ptr, (char *)&rhead, + timeout); + if (res != RPC_SUCCESS) return; - } - while (fgets(buf, sizeof(buf), fp) != NULL) { - unsigned int progn, port; - char proto[128], prog[128] = "rpc."; + + for (; rhead; rhead = rhead->rpcb_next) { + char prog[128] = "rpc."; struct scache *c; + int hport, lport, ok; - if (sscanf(buf, "%u %*d %s %u %s", - &progn, proto, &port, prog+4) != 4) + c = malloc(sizeof(*c)); + if (!c) continue; - if (!(c = malloc(sizeof(*c)))) + ok = sscanf(rhead->rpcb_map.r_addr, "::.%d.%d", &hport, &lport); + if (!ok) + ok = sscanf(rhead->rpcb_map.r_addr, "0.0.0.0.%d.%d", + &hport, &lport); + if (!ok) continue; + c->port = hport << 8 | lport; - c->port = port; - c->name = strdup(prog); - if (strcmp(proto, TCP_PROTO) == 0) + if (strcmp(rhead->rpcb_map.r_netid, TCP_PROTO) == 0 || + strcmp(rhead->rpcb_map.r_netid, TCP6_PROTO) == 0) c->proto = TCP_PROTO; - else if (strcmp(proto, UDP_PROTO) == 0) + else if (strcmp(rhead->rpcb_map.r_netid, UDP_PROTO) == 0 || + strcmp(rhead->rpcb_map.r_netid, UDP6_PROTO) == 0) c->proto = UDP_PROTO; - else if (strcmp(proto, SCTP_PROTO) == 0) + else if (strcmp(rhead->rpcb_map.r_netid, SCTP_PROTO) == 0) c->proto = SCTP_PROTO; else - c->proto = NULL; + continue; + + rpc = getrpcbynumber(rhead->rpcb_map.r_prog); + if (rpc) { + strncat(prog, rpc->r_name, 128 - strlen(prog)); + c->name = strdup(prog); + } + c->next = rlist; rlist = c; } - pclose(fp); } +#endif /* Even do not try default linux ephemeral port ranges: * default /etc/services contains so much of useless crap @@ -5668,9 +5719,11 @@ int main(int argc, char *argv[]) filter_states_set(¤t_filter, state_filter); filter_merge_defaults(¤t_filter); +#ifdef HAVE_RPC if (!numeric && resolve_hosts && (current_filter.dbs & (UNIX_DBM|INET_L4_DBM))) init_service_resolver(); +#endif if (current_filter.dbs == 0) { fprintf(stderr, "ss: no socket tables to show with such filter.\n");