{"id":806426,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806426/?format=json","project":{"id":54,"url":"http://patchwork.ozlabs.org/api/1.0/projects/54/?format=json","name":"LEDE development","link_name":"lede","list_id":"lede-dev.lists.infradead.org","list_email":"lede-dev@lists.infradead.org","web_url":"http://lede-project.org/","scm_url":"","webscm_url":"http://git.lede-project.org/"},"msgid":"<20170828075744.24609-2-fe@dev.tdt.de>","date":"2017-08-28T07:57:44","name":"[LEDE-DEV,2/2] main: add start|stop|flush|reload|restart event handling","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"237742c80adc2d7a631cffdfec1dbcb36eb3f5f0","submitter":{"id":72238,"url":"http://patchwork.ozlabs.org/api/1.0/people/72238/?format=json","name":"Florian Eckert","email":"fe@dev.tdt.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/lede/patch/20170828075744.24609-2-fe@dev.tdt.de/mbox/","series":[{"id":96,"url":"http://patchwork.ozlabs.org/api/1.0/series/96/?format=json","date":"2017-08-28T07:57:43","name":"[LEDE-DEV,1/2] utils: rename function fw3_hotplug to fw3_hotplug_zone","version":1,"mbox":"http://patchwork.ozlabs.org/series/96/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806426/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (mailfrom)\n\tsmtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133;\n\thelo=bombadil.infradead.org;\n\tenvelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"Y1bhTZp5\"; \n\tdkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xgkg74wlzz9sNq\n\tfor ;\n\tMon, 28 Aug 2017 17:58:59 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dmEwd-00086d-Rt; Mon, 28 Aug 2017 07:58:51 +0000","from ms.tdt.de ([195.243.126.94] helo=mail.dev.tdt.de)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dmEw2-0007vA-9R\n\tfor lede-dev@lists.infradead.org; Mon, 28 Aug 2017 07:58:16 +0000","from feckert01.dev.tdt.de (unknown [10.1.3.40])\n\tby mail.dev.tdt.de (Postfix) with ESMTPSA id 4BD5921A22\n\tfor ;\n\tMon, 28 Aug 2017 07:57:50 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help:\n\tList-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References:\n\tIn-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID:\n\tContent-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc\n\t:Resent-Message-ID:List-Owner;\n\tbh=fBr3aBN6PaJ7umfK7sh+gF4Z+p19cLiF0IToiUvhKa4=;\n\tb=Y1bhTZp5DDML8aTD6c8ZQcN+5t\n\tuQpKJt71KRg69841HTT2W0WogoOy6OrOW1WQy+MRAL7QKj7mZ7DPAx6sE685X2PKNN2KvgN1Sfnwu\n\tMSJlkD//L90HwZkDxWPiG+/4+xRYoOsyMmJ3iE84LcA2CmwSdJ1HL4BnJbk0CUQeJWnbXh9X7lwVk\n\ty27uNJeu/1Ro/EE48e9ajLkxBFF2ME+A7EKUpWSo8+lIg1ARdmN0/1UpkfJiuomNQ3F+lokFAJW+6\n\tTzptraa5E2c85pTKN2/pVrCdGPuYkWviS4yGB1FCRMgqP6emngNi+bb4aTCoAjL9g6XgTZX2Niws5\n\t82+3JW/w==;","From":"Florian Eckert ","To":"lede-dev@lists.infradead.org","Date":"Mon, 28 Aug 2017 09:57:44 +0200","Message-Id":"<20170828075744.24609-2-fe@dev.tdt.de>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170828075744.24609-1-fe@dev.tdt.de>","References":"<20170828075744.24609-1-fe@dev.tdt.de>","X-Spam-Status":"No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED\n\tautolearn=ham autolearn_force=no version=3.4.0","X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on mail.dev.tdt.de","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170828_005814_525263_00EAC671 ","X-CRM114-Status":"GOOD ( 10.76 )","X-Spam-Score":"-1.9 (-)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-1.9 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay\n\tdomain\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]","Subject":"[LEDE-DEV] [PATCH 2/2] main: add start|stop|flush|reload|restart\n\tevent handling","X-BeenThere":"lede-dev@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"Lede-dev\" ","Errors-To":"lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"Add -e option for fw3 start|stop|flush|reload|restart events.\nIf option is set, then common hotplug events are executed in dir\n'/etc/hotplug.d/firewall'\n\nSigned-off-by: Florian Eckert \n---\n main.c | 13 +++++++++++--\n utils.c | 33 +++++++++++++++++++++++++++++++++\n utils.h | 5 ++++-\n 3 files changed, 48 insertions(+), 3 deletions(-)","diff":"diff --git a/main.c b/main.c\nindex c4b8228..9a7b6dd 100644\n--- a/main.c\n+++ b/main.c\n@@ -504,7 +504,7 @@ static int\n usage(void)\n {\n \tfprintf(stderr, \"fw3 [-4] [-6] [-q] print\\n\");\n-\tfprintf(stderr, \"fw3 [-q] {start|stop|flush|reload|restart}\\n\");\n+\tfprintf(stderr, \"fw3 [-q] [-e] {start|stop|flush|reload|restart}\\n\");\n \tfprintf(stderr, \"fw3 [-q] network {net}\\n\");\n \tfprintf(stderr, \"fw3 [-q] device {dev}\\n\");\n \tfprintf(stderr, \"fw3 [-q] zone {zone} [dev]\\n\");\n@@ -519,7 +519,7 @@ int main(int argc, char **argv)\n \tenum fw3_family family = FW3_FAMILY_ANY;\n \tstruct fw3_defaults *defs = NULL;\n \n-\twhile ((ch = getopt(argc, argv, \"46dqh\")) != -1)\n+\twhile ((ch = getopt(argc, argv, \"46dqhe\")) != -1)\n \t{\n \t\tswitch (ch)\n \t\t{\n@@ -539,6 +539,10 @@ int main(int argc, char **argv)\n \t\t\tif (freopen(\"/dev/null\", \"w\", stderr)) {}\n \t\t\tbreak;\n \n+\t\tcase 'e':\n+\t\t\tfw3_do_hotplug = true;\n+\t\t\tbreak;\n+\n \t\tcase 'h':\n \t\t\trv = usage();\n \t\t\tgoto out;\n@@ -589,6 +593,7 @@ int main(int argc, char **argv)\n \t\t{\n \t\t\tbuild_state(true);\n \t\t\trv = start();\n+\t\t\tfw3_hotplug(\"start\");\n \t\t\tfw3_unlock();\n \t\t}\n \t}\n@@ -598,6 +603,7 @@ int main(int argc, char **argv)\n \t\t{\n \t\t\tbuild_state(true);\n \t\t\trv = stop(false);\n+\t\t\tfw3_hotplug(\"stop\");\n \t\t\tfw3_unlock();\n \t\t}\n \t}\n@@ -607,6 +613,7 @@ int main(int argc, char **argv)\n \t\t{\n \t\t\tbuild_state(true);\n \t\t\trv = stop(true);\n+\t\t\tfw3_hotplug(\"flush\");\n \t\t\tfw3_unlock();\n \t\t}\n \t}\n@@ -617,6 +624,7 @@ int main(int argc, char **argv)\n \t\t\tbuild_state(true);\n \t\t\tstop(true);\n \t\t\trv = start();\n+\t\t\tfw3_hotplug(\"restart\");\n \t\t\tfw3_unlock();\n \t\t}\n \t}\n@@ -626,6 +634,7 @@ int main(int argc, char **argv)\n \t\t{\n \t\t\tbuild_state(true);\n \t\t\trv = reload();\n+\t\t\tfw3_hotplug(\"reload\");\n \t\t\tfw3_unlock();\n \t\t}\n \t}\ndiff --git a/utils.c b/utils.c\nindex f855840..29c3e46 100644\n--- a/utils.c\n+++ b/utils.c\n@@ -29,6 +29,7 @@ static pid_t pipe_pid = -1;\n static FILE *pipe_fd = NULL;\n \n bool fw3_pr_debug = false;\n+bool fw3_do_hotplug = false;\n \n \n static void\n@@ -749,6 +750,38 @@ fw3_hotplug_zone(bool add, void *zone, void *device)\n \treturn false;\n }\n \n+bool\n+fw3_hotplug(const char *event)\n+{\n+\tif(!fw3_do_hotplug)\n+\t\treturn false;\n+\n+\tswitch (fork())\n+\t{\n+\tcase -1:\n+\t\twarn(\"Unable to fork(): %s\\n\", strerror(errno));\n+\t\treturn false;\n+\n+\tcase 0:\n+\t\tbreak;\n+\n+\tdefault:\n+\t\treturn true;\n+\t}\n+\n+\tclose(0);\n+\tclose(1);\n+\tclose(2);\n+\tif (chdir(\"/\")) {};\n+\n+\tclearenv();\n+\tsetenv(\"ACTION\", event, 1);\n+\texecl(FW3_HOTPLUG, FW3_HOTPLUG, \"firewall\", NULL);\n+\n+\t/* unreached */\n+\treturn false;\n+}\n+\n int\n fw3_netmask2bitlen(int family, void *mask)\n {\ndiff --git a/utils.h b/utils.h\nindex 9ad7b91..08453c1 100644\n--- a/utils.h\n+++ b/utils.h\n@@ -38,9 +38,10 @@\n \n #define FW3_STATEFILE\t\"/var/run/fw3.state\"\n #define FW3_LOCKFILE\t\"/var/run/fw3.lock\"\n-#define FW3_HOTPLUG \"/sbin/hotplug-call\"\n+#define FW3_HOTPLUG\t\"/sbin/hotplug-call\"\n \n extern bool fw3_pr_debug;\n+extern bool fw3_do_hotplug;\n \n void warn_elem(struct uci_element *e, const char *format, ...);\n void warn(const char *format, ...);\n@@ -108,6 +109,8 @@ void fw3_free_list(struct list_head *head);\n \n bool fw3_hotplug_zone(bool add, void *zone, void *device);\n \n+bool fw3_hotplug(const char *event);\n+\n int fw3_netmask2bitlen(int family, void *mask);\n \n bool fw3_bitlen2netmask(int family, int bits, void *mask);\n","prefixes":["LEDE-DEV","2/2"]}