From patchwork Wed May 4 19:07:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 16067 Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 24B1882534; Wed, 4 May 2016 21:07:49 +0200 (CEST) Authentication-Results: open-mesh.org; dmarc=none header.from=open-mesh.com Authentication-Results: open-mesh.org; dkim=fail reason="verification failed; unprotected key" header.d=open-mesh-com.20150623.gappssmtp.com header.i=@open-mesh-com.20150623.gappssmtp.com header.b=1O6JVA3d; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received-SPF: Neutral (access neither permitted nor denied) identity=mailfrom; client-ip=2a00:1450:400c:c09::233; helo=mail-wm0-x233.google.com; envelope-from=sven.eckelmann@open-mesh.com; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=none header.from=open-mesh.com Received: from mail-wm0-x233.google.com (mail-wm0-x233.google.com [IPv6:2a00:1450:400c:c09::233]) by open-mesh.org (Postfix) with ESMTPS id 3AA2482509 for ; Wed, 4 May 2016 21:07:38 +0200 (CEST) Received: by mail-wm0-x233.google.com with SMTP id n129so201468703wmn.1 for ; Wed, 04 May 2016 12:07:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jB8jwv2DNHlQjJZpLAUu+G/2flY9qzUUuVplcqEacQU=; b=1O6JVA3dw7TyurKundhQb8GvjhO/nGvSoE3P7E4xpFHsbWanhfbJm0YHPe0x7Ynak4 FLbWbU63c8QtGr46DKXs5886xA30y6tlCJoW12DeM1k85iNUXIXVw7MLuvGnFVUSVMpP /Un53FCo+4625zeILgr6AXQuuX+el2Bo1QbYPOCjgpvioMu1Cl3oac2y0puXhqRGPhoq jWs17SvOBdkr4/iHTRNfYhS/iHgviurARudEK76NDbzVkAdnZ1t8bLUuDJZka+csFLzZ w7Z311uWMOiU6Do4xrxDc8giQPSSuT090DAS9EcFa+UmzSgeMQp806H3zwXKd6wPtMPa UTow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jB8jwv2DNHlQjJZpLAUu+G/2flY9qzUUuVplcqEacQU=; b=YKfrEl2tEmCELhAioC5Ez8J80mJY+rVFHf0JhsGg4SPoyxdiJStXOMX3VklUBFw1+j Dtg6daR8lRp6CIDJWYAVBD9CeeTip9mkw365sJzlAWYwDb3dGrffFIE1ljoigNn5CPcK oJtmCJXSBE5p4xkuqc96X2yMKGI2wG10rWL8nbkxoQDBt5nkY5zrRmFd5gazFyhHJWI9 nyMPuIElELVRrbmt0C7LcqHWkaR0bM0WCSNgsTPOY/RFXWh9O2m9kYnkJP+yO3w7KYJn FnCJ/tyS1fgyvlzIH/+L8TLrIAbFEamuNbmC8MIlH0kfjNC5OJkpWhOOJCyhkqr+tD/c KuOQ== X-Gm-Message-State: AOPr4FXrcd5ZAUTeN03j9Aqku08AcV6RwImOmTcNeloF88cDvAsl8AzRjD1beoeRxbtT+07Q X-Received: by 10.194.119.195 with SMTP id kw3mr10073238wjb.166.1462388857221; Wed, 04 May 2016 12:07:37 -0700 (PDT) Received: from sven-desktop.home.narfation.org (p4FFE421B.dip0.t-ipconnect.de. [79.254.66.27]) by smtp.gmail.com with ESMTPSA id kq9sm5733515wjc.26.2016.05.04.12.07.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 May 2016 12:07:36 -0700 (PDT) From: Sven Eckelmann X-Google-Original-From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Wed, 4 May 2016 21:07:25 +0200 Message-Id: <1462388847-8440-2-git-send-email-sven@open-mesh.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <4642303.DsCp7UQf8m@bentobox> References: <4642303.DsCp7UQf8m@bentobox> Cc: Sven Eckelmann Subject: [B.A.T.M.A.N.] [PATCH v4 2/4] batctl: Add basic infrastructure to integrate netlink X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" From: Sven Eckelmann Netlink can be used to add new communication functionality to the kernel module. It can also be used to replace the old debugfs files. The binary interface used for this will be defined in the added files. Signed-off-by: Sven Eckelmann --- Makefile | 12 ++++++++++++ batman_adv.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ netlink.c | 28 ++++++++++++++++++++++++++++ netlink.h | 30 ++++++++++++++++++++++++++++++ 4 files changed, 123 insertions(+) create mode 100644 batman_adv.h create mode 100644 netlink.c create mode 100644 netlink.h diff --git a/Makefile b/Makefile index a037847..3fa21f4 100755 --- a/Makefile +++ b/Makefile @@ -32,6 +32,7 @@ OBJ += hash.o OBJ += ioctl.o OBJ += list-batman.o OBJ += main.o +OBJ += netlink.o OBJ += ping.o OBJ += sys.o OBJ += tcpdump.o @@ -73,6 +74,17 @@ endif CFLAGS += $(LIBNL_CFLAGS) LDLIBS += $(LIBNL_LDLIBS) +ifeq ($(origin LIBNL_GENL_CFLAGS) $(origin LIBNL_GENL_LDLIBS), undefined undefined) + LIBNL_GENL_NAME ?= libnl-genl-3.0 + ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_GENL_NAME) 2>/dev/null),) + $(error No $(LIBNL_GENL_NAME) development libraries found!) + endif + LIBNL_GENL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBNL_GENL_NAME)) + LIBNL_GENL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBNL_GENL_NAME)) +endif +CFLAGS += $(LIBNL_GENL_CFLAGS) +LDLIBS += $(LIBNL_GENL_LDLIBS) + # standard build tools ifeq ($(CONFIG_BATCTL_BISECT),y) OBJ += $(OBJ_BISECT) diff --git a/batman_adv.h b/batman_adv.h new file mode 100644 index 0000000..ba611a7 --- /dev/null +++ b/batman_adv.h @@ -0,0 +1,53 @@ +/* Copyright (C) 2016 B.A.T.M.A.N. contributors: + * + * Matthias Schiffer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#ifndef _UAPI_LINUX_BATMAN_ADV_H_ +#define _UAPI_LINUX_BATMAN_ADV_H_ + +#define BATADV_NL_NAME "batadv" + +/** + * enum batadv_nl_attrs - batman-adv netlink attributes + * + * @BATADV_ATTR_UNSPEC: unspecified attribute to catch errors + * @__BATADV_ATTR_AFTER_LAST: internal use + * @NUM_BATADV_ATTR: total number of batadv_nl_attrs available + * @BATADV_ATTR_MAX: highest attribute number currently defined + */ +enum batadv_nl_attrs { + BATADV_ATTR_UNSPEC, + /* add attributes above here, update the policy in netlink.c */ + __BATADV_ATTR_AFTER_LAST, + NUM_BATADV_ATTR = __BATADV_ATTR_AFTER_LAST, + BATADV_ATTR_MAX = __BATADV_ATTR_AFTER_LAST - 1 +}; + +/** + * enum batadv_nl_commands - supported batman-adv netlink commands + * + * @BATADV_CMD_UNSPEC: unspecified command to catch errors + * @__BATADV_CMD_AFTER_LAST: internal use + * @BATADV_CMD_MAX: highest used command number + */ +enum batadv_nl_commands { + BATADV_CMD_UNSPEC, + /* add new commands above here */ + __BATADV_CMD_AFTER_LAST, + BATADV_CMD_MAX = __BATADV_CMD_AFTER_LAST - 1 +}; + +#endif /* _UAPI_LINUX_BATMAN_ADV_H_ */ diff --git a/netlink.c b/netlink.c new file mode 100644 index 0000000..409953a --- /dev/null +++ b/netlink.c @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * + * Marek Lindner + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + +#include "netlink.h" +#include "main.h" + +#include "batman_adv.h" + +struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { +}; diff --git a/netlink.h b/netlink.h new file mode 100644 index 0000000..0a4d3dd --- /dev/null +++ b/netlink.h @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * + * Marek Lindner + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + +#ifndef _BATCTL_NETLINK_H +#define _BATCTL_NETLINK_H + +#include +#include + +extern struct nla_policy batadv_netlink_policy[]; + +#endif /* _BATCTL_NETLINK_H */