From patchwork Wed Nov 29 10:26:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borja Salazar X-Patchwork-Id: 842525 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BWyxIO6+"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=fon-com.20150623.gappssmtp.com header.i=@fon-com.20150623.gappssmtp.com header.b="HP0TcJ/O"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ymxZj6xThz9s74 for ; Wed, 29 Nov 2017 21:28:29 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=d9IUYRc0EXjlTHer9Q6hqwnZMuIJ3vzUBRQYo10uCkM=; b=BWyxIO6+NIiT6a NAm2RZLAgKadC7cwVO3pLs4FRJJAUcsJ6h1plI1wEnqzhJvS+xFLAV3+2W7iL9DO3/8VLJ/ViJ9lQ 9y4/yuXrhoikaItYJHl10W2d37MCv7D5M6g7D06JHjr1yXAVB0O3COyc/Arq679dmHE/aO8HVQfoA 9GsfD9PRa0srj2zDRmhi1p6BmBsK1K2SIWO7i+Je902aL/Ey/UjGwoYizuYLK19pgnDshvNmS2Y6R ILM6jF6p9olT85Pez6IZGtt/9uGc1kX9PofN9DHYmxkcBBHVi/H7WWCNtLzyWixIYQ+w8PhOwm/Zo wFtLjO39Sm9wezG7Ycnw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eJzbG-0004VS-Tv; Wed, 29 Nov 2017 10:28:18 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eJzbC-0004Hd-Ql for lede-dev@lists.infradead.org; Wed, 29 Nov 2017 10:28:17 +0000 Received: by mail-wm0-x242.google.com with SMTP id f9so4898522wmh.0 for ; Wed, 29 Nov 2017 02:27:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fon-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=a03X11KnkQR+sviSNAEkcWeDS/wsOddHucPqQjh4Y7k=; b=HP0TcJ/OgWNPF612bsiUipicQtidTWgBIq7euHSBJQPZp4BAmQTYbkk0jfEz6RN/h5 oIIS8dn7dbA0PSmji8U1R9LQLCCLx6t1PvuthPJGIt2d7H5j1aRfIYoHUkcB2OCK66Ov H0bILf4USJZ4CVgd4/x8WqSpvaum/woS3vh5/9sRcLwJMRhYJycCmRQHFvTmRc61zYuK 3qDVjviWawWtr/fQNVV1RzUFe03/Xo1jecLlEeK1VJgwOcmXCyU4Os/oIt/Vy2nu9QeK /nXo677cq0zN8zuY/LW5tcY94HtSqWcsZTOrno5Vo/yXEgFT+lBYoWXUUwjvuXQFKfyp ME/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=a03X11KnkQR+sviSNAEkcWeDS/wsOddHucPqQjh4Y7k=; b=K0qzQwbtRMVU2ErsMNvm96IwxVM11vC27pZjU6CRog15XmHWHcLk0QypKl+up2/x3B GReboAzBnrvVFAbU64Me8qs2MEI928ONEjq+QfIA8/2rtQLEmkl/gbQn7KV9Khwanr5W Ioxa+/fRiqD0HQb1N3unkmjbvSqliOFHmNkoMU0aLJL5kcWK98Q0F1nDeyCqg9BoV58Y VUIr9wzuGtDTCtugPLEy34rSSdG9UoI1/3uw2zCGbyw6kjnOPJDLiq5V//yU4kwkdBz4 NgbidPlhEOYHYvpq8ggJEARHG6a//32zvxkCcJxaDmh+EW4TixDdpKoOn7+nUPJtrNQg oVtg== X-Gm-Message-State: AJaThX7mpLALqsQDp4TJc5mkUSc2YMgKwSeqAghbE9Hfx27g9hmJ86pn g66qUaBbIpIEZZiUgsB7ndakf9Ci X-Google-Smtp-Source: AGs4zMaNvWbMF5/NdGHqKoparB4mrrdG+cx8Q9BWhz/PlM/ezl6Sf9TEq8xg0gLgtCwJdGjPsptVtQ== X-Received: by 10.28.238.221 with SMTP id j90mr2205122wmi.44.1511951272383; Wed, 29 Nov 2017 02:27:52 -0800 (PST) Received: from BSalazar.fon.ofi ([213.27.197.25]) by smtp.gmail.com with ESMTPSA id 138sm2444696wmf.21.2017.11.29.02.27.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Nov 2017 02:27:51 -0800 (PST) From: Borja Salazar To: lede-dev@lists.infradead.org Date: Wed, 29 Nov 2017 11:26:58 +0100 Message-Id: <20171129102658.14525-1-borja.salazar@fon.com> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171129_022815_081811_C30A0EEE X-CRM114-Status: UNSURE ( 9.55 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH v3] dnsmaq: add interface to ubus notification X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Borja Salazar MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Borja Salazar --- package/network/services/dnsmasq/Makefile | 2 +- package/network/services/dnsmasq/patches/240-ubus.patch | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index ad118c6626..2c1073c148 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_VERSION:=2.78 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/ diff --git a/package/network/services/dnsmasq/patches/240-ubus.patch b/package/network/services/dnsmasq/patches/240-ubus.patch index 0e0b1dd1b0..0a380ca824 100644 --- a/package/network/services/dnsmasq/patches/240-ubus.patch +++ b/package/network/services/dnsmasq/patches/240-ubus.patch @@ -9,7 +9,7 @@ struct daemon *daemon; static volatile pid_t pid = 0; -@@ -32,6 +34,62 @@ static void fatal_event(struct event_des +@@ -32,6 +34,64 @@ static void fatal_event(struct event_des static int read_event(int fd, struct event_desc *evp, char **msg); static void poll_resolv(int force, int do_reload, time_t now); @@ -25,7 +25,7 @@ + .type = &ubus_object_type, +}; + -+void ubus_event_bcast(const char *type, const char *mac, const char *ip, const char *name) ++void ubus_event_bcast(const char *type, const char *mac, const char *ip, const char *name, const char *interface) +{ + if (!ubus || !ubus_object.has_subscribers) + return; @@ -37,6 +37,8 @@ + blobmsg_add_string(&b, "ip", ip); + if (name) + blobmsg_add_string(&b, "name", name); ++ if (interface) ++ blobmsg_add_string(&b, "interface", interface); + ubus_notify(ubus, &ubus_object, type, b.head, -1); +} + @@ -106,7 +108,7 @@ # endif #endif -+void ubus_event_bcast(const char *type, const char *mac, const char *ip, const char *name); ++void ubus_event_bcast(const char *type, const char *mac, const char *ip, const char *name, const char *interface); + /* ipset.c */ #ifdef HAVE_IPSET @@ -118,9 +120,9 @@ string ? string : "", err ? err : ""); + if (!strcmp(type, "DHCPACK")) -+ ubus_event_bcast("dhcp.ack", daemon->namebuff, addr ? inet_ntoa(a) : NULL, string ? string : NULL); ++ ubus_event_bcast("dhcp.ack", daemon->namebuff, addr ? inet_ntoa(a) : NULL, string ? string : NULL, interface); + else if (!strcmp(type, "DHCPRELEASE")) -+ ubus_event_bcast("dhcp.release", daemon->namebuff, addr ? inet_ntoa(a) : NULL, string ? string : NULL); ++ ubus_event_bcast("dhcp.release", daemon->namebuff, addr ? inet_ntoa(a) : NULL, string ? string : NULL, interface); } static void log_options(unsigned char *start, u32 xid)