From nobody Thu Oct 05 13:43:19 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S1Xnh1bpCz4wkY0; Thu, 5 Oct 2023 13:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S1Xnh17Q7z4LQS; Thu, 5 Oct 2023 13:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696513400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N8GPA7Bi62yfhF2LvdiZcJ1FeQYxZAzbJHeCO+WQkjI=; b=dl3uJPxgEwTQsqjd38KDKkdlQQpjGU0rePm0lcdPzsmF6Oq4htZQ+VbxbHIYY0nk8nBhn1 /Vs75+n1Dn1EQpbn5hyTuxx18Ufxyj+dm4dro/tpAjOI46WMWxmqIN2eBSJWDmqBgLSx+t F2Faurjhmmm1Drdg03D/7jDbQzLmsZ99Sk2twer5y8tkWjj8hqgaGQq6pmT2107H7vtbCA E37c51wyxp7Ixcf0f+IrdG4iXJjs4crvQGQTxqTmQuRt0wKhg+czLek97infawhrnGb9dn ae3EYlj59hhm+h9EcTK/WxKwocz5XiIaTPbs6issvrPYFuYBZcSI255yrhLtDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696513400; a=rsa-sha256; cv=none; b=reX3kJWYaiYxcYP/eE8Db3kXEosgkmOj3P40dJTGpmc22aYNPJX1AYQHXI5zrT1dL0YLpq caEFIqY1tSEgnk5ggYe52aqzNXwsunm3aT/nhuGxIF9aETmbJ4LrKXgA1OSLZ6a4A0mBW1 3CU+8lhFnz7G9SOpHcRWymFmV7TMAXZvWDQYLswdk1kQSusU54cIHNVJBI+IqPzJ7Xbxce WDV55P8Cm+lLdqZWcn4iZ5FoIMttHqJLcFo0rqEjdo2StjRVWohEnxb2p7ntduTvUB5EWV tD3EMlechkQ4jkSBurmyYK33/bh5v4Bd1eY31NPmpbAv8RBFu3xPcKqhjGTNMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696513400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N8GPA7Bi62yfhF2LvdiZcJ1FeQYxZAzbJHeCO+WQkjI=; b=EYv0u35UOiPxP3LRvDhzEvkydbjHmT6MsiYi4BOZ22FDuxlb5Z2ztFs5mj635K3K/ual1q U4BJEqRlmf+rN/d2Rymr9DvxN+w/7JcEtQzdydMRWz9kn+Ea1j8iazvmnhaCQjj0mYrqmJ gKkmLbdcLDmUrAsa+PVQJaswZ6jnX5q7stmsnmuE9ipkknUkWLenM4jwpYmrBZV0zjRUHU LA/gtNCsqlOHE4msLGvGl9lHWFbPCJkXa0nmPukCqqX5Tgb7T2iTmdYE5QaAQLLUubnQWR Bm70dBxH3zf4pt4WZrYeM6Q35wjPSByvUQ099cvhSyfK1nmNyXiNvLIFuoEKIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S1Xnh0BVgz1M6D; Thu, 5 Oct 2023 13:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 395DhJD2027856; Thu, 5 Oct 2023 13:43:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395DhJpR027853; Thu, 5 Oct 2023 13:43:19 GMT (envelope-from git) Date: Thu, 5 Oct 2023 13:43:19 GMT Message-Id: <202310051343.395DhJpR027853@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 5dfd41ef269e - 2023Q4 - net/socketbind: unbreak the library List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 5dfd41ef269e881343ac39b04f3643ac4dc8cff2 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=5dfd41ef269e881343ac39b04f3643ac4dc8cff2 commit 5dfd41ef269e881343ac39b04f3643ac4dc8cff2 Author: Eugene Grosbein AuthorDate: 2023-10-05 13:05:10 +0000 Commit: Eugene Grosbein CommitDate: 2023-10-05 13:42:41 +0000 net/socketbind: unbreak the library The code has multiple issues making it unusable with modern FreeBSD: * it uses long gone ascii2addr() function removed in 2007; * it passes hardcoded "/usr/lib/libc.so" path to dlopen(), but now it is plain text hint file; * this IPv4-only code neglects to check passed domain for PF_INET messing with sockets in other domains (like PF_INET6, PF_LOCAL). Still, it is very useful while dealing with software like Nagios that does not support binding to specific IPv4 address for outgoing connections. The library solves the problem with single line in /etc/rc.conf: nagios_env="LD_PRELOAD=/usr/local/lib/libsocketbind.so.1 BINDTO=192.168.6.1" This changes unbreaks the library making it usable again. (cherry picked from commit 03a9755147acbd1933f5c991ce33ae1bc375746d) --- net/socketbind/Makefile | 1 + net/socketbind/files/socketbind.c | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net/socketbind/Makefile b/net/socketbind/Makefile index 3725a84f17b0..bf17612645ba 100644 --- a/net/socketbind/Makefile +++ b/net/socketbind/Makefile @@ -1,5 +1,6 @@ PORTNAME= socketbind PORTVERSION= 1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= # none DISTFILES= # none diff --git a/net/socketbind/files/socketbind.c b/net/socketbind/files/socketbind.c index 51d929d9b794..340083adaefb 100644 --- a/net/socketbind/files/socketbind.c +++ b/net/socketbind/files/socketbind.c @@ -2,32 +2,31 @@ #include #include #include +#include #include +#include -static void *socket_p, *dl_handle; +static void *socket_p = NULL; static struct sockaddr_in bind_addr; static int do_bind; int socket(int domain, int type, int protocol) { auto int res; - if (dl_handle == NULL) { + if (socket_p == NULL) { char *str; - dl_handle = dlopen("/usr/lib/libc.so", RTLD_LAZY); - if (dl_handle == NULL) - return -1; - socket_p = dlsym(dl_handle, "socket"); + socket_p = dlsym(RTLD_NEXT, "socket"); if (!socket_p) return -1; #ifdef DEBUG printf("Loaded socket %x\n", socket_p); #endif - if ((str = getenv("BINDTO")) != NULL) { + if ((domain == PF_INET) && (str = getenv("BINDTO")) != NULL) { #ifdef DEBUG printf("Thinking about bind\n"); #endif - if (ascii2addr(AF_INET, str, &bind_addr.sin_addr)) { + if (inet_aton(str, &bind_addr.sin_addr)) { do_bind = 1; bind_addr.sin_len = INET_ADDRSTRLEN; bind_addr.sin_family = AF_INET;