From patchwork Thu Jul 6 21:05:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jon X-Patchwork-Id: 6972 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Qxpwl2Hnmz3wjw for ; Thu, 6 Jul 2023 21:06:15 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Qxpwj4yKlzhS; Thu, 6 Jul 2023 21:06:13 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Qxpwj3Lzqz2yjT; Thu, 6 Jul 2023 21:06:13 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Qxpwg67Rmz2x9j for ; Thu, 6 Jul 2023 21:06:11 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Qxpwf36kgzLq; Thu, 6 Jul 2023 21:06:10 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1688677570; 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=XCGRL3Qpe7Te1XjRCu/qxj14zNAyjWevNincaMB5aLg=; b=3F2l10wTuQQMdtF40yNrQJ/CovJ+08gCZ3tDE6EIOCrgpKImTrStouUMujoYIWJ7JgVPBL 7j3oVMzLsYFwSUDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1688677570; 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=XCGRL3Qpe7Te1XjRCu/qxj14zNAyjWevNincaMB5aLg=; b=FhyyBgH8GiJyRFeRisudC4Lr57aidrouq602+DG+i11ehFZeZ7+KddTxaxCaq2oZ3cT4sZ f0DX6Y7buvnEroDarfalSjfc1Q9fSdlJ3Ln7VUTp6AcpU1sAQfpWyjN2sLoRZCNlwOWVjU ZKghAnDyC5f5TZAlTTyjOh8FBVL9/zc/ok2Xs4mZLjvsu9RlMQvomLOrFc39/lqi2CQII/ gIt/LEKLUHekGGOkJ02xeFwVhZ2dCKryBNtXhxwed+fIhpFXwGLJM8uHr6WvkSemiunFSm 27c08TlsQQ5r7IeDusapalyrXavJm0qkrGb40tbh8oWBnFmEzZXssHKGhoEZVg== From: Jon Murphy To: development@lists.ipfire.org Subject: [PATCH v2] pmacct: fix bug 13159 Date: Thu, 6 Jul 2023 16:05:06 -0500 Message-Id: <20230706210506.983914-1-jon.murphy@ipfire.org> In-Reply-To: <20230706021502.1739629-1-jon.murphy@ipfire.org> References: <20230706021502.1739629-1-jon.murphy@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - changes `interface` to `pcap_interface` in pmacct.conf file. - thank you to @iptom for finding and reporting the issue and to many others for pitching in and helping debug! Signed-off-by: Jon Murphy --- config/pmacct/pmacct.conf | 25 ++++++++++++++++++++----- lfs/pmacct | 4 ++-- src/paks/pmacct/install.sh | 12 ++++++++++-- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/config/pmacct/pmacct.conf b/config/pmacct/pmacct.conf index 3c1d47efa..79e3fd6a7 100644 --- a/config/pmacct/pmacct.conf +++ b/config/pmacct/pmacct.conf @@ -2,23 +2,38 @@ ! Pmacctd configuration file for IPFire environment ! +!----------------------------------- global ----------------------------------- + syslog: daemon daemonize: true debug: false promisc: true -interface: green0 +pcap_interface: green0 + +imt_mem_pools_number: 256 +plugins: memory[plugin1] # , sqlite3[plugin2] + + +!----------------------------------- memory ----------------------------------- ! ! "plugin1" plugin configuration ! -plugins: memory[plugin1] plugin_buffer_size[plugin1]: 102400 -plugin_pipe_size[plugin1]: 10240000 +plugin_pipe_size[plugin1]: 10240000 -imt_mem_pools_number: 256 imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto -aggregate_filter[plugin1]: ip \ No newline at end of file +aggregate_filter[plugin1]: ip + + +!----------------------------------- sqlite3 ---------------------------------- + +! +! "plugin2" plugin configuration +! + +! add your sqlite3 plugin2 here... diff --git a/lfs/pmacct b/lfs/pmacct index 7c8b32772..4be1be156 100644 --- a/lfs/pmacct +++ b/lfs/pmacct @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2019-2023 IPFire Team # +# Copyright (C) 2019-2023 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = pmacct -PAK_VER = 5 +PAK_VER = 6 DEPS = libcdada diff --git a/src/paks/pmacct/install.sh b/src/paks/pmacct/install.sh index 11b16f6c1..abf8ce37e 100755 --- a/src/paks/pmacct/install.sh +++ b/src/paks/pmacct/install.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team . # +# Copyright (C) 2007-2023 IPFire-Team . # # # ############################################################################ # @@ -26,11 +26,19 @@ extract_files restore_backup ${NAME} +# update needed for a change in config file +# temporary update added for CU 177 +CONFIG="/etc/pmacct/pmacct.conf" +if grep -q "^interface" "${CONFIG}" ; then + if sed -i.bak 's|^interface|pcap_interface|g' "${CONFIG}" ; then + logger -t pmacct "updated ${CONFIG} and changed \"interface\" to \"pcap_interface\"" + fi +fi + # Add symlinks for runlevels ln -s ../init.d/${NAME} /etc/rc.d/rc0.d/K85${NAME} ln -s ../init.d/${NAME} /etc/rc.d/rc3.d/S50${NAME} ln -s ../init.d/${NAME} /etc/rc.d/rc6.d/K85${NAME} start_service ${NAME} - # EOF