From patchwork Thu May 5 11:09:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 16079 X-Patchwork-Delegate: mareklindner@neomailbox.ch 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 7B3A5826B8; Thu, 5 May 2016 13:11:21 +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=fdNr0WyV; 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 ED149826BE for ; Thu, 5 May 2016 13:10:08 +0200 (CEST) Received: by mail-wm0-x233.google.com with SMTP id n129so16057118wmn.1 for ; Thu, 05 May 2016 04:10:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=3gJk3VSepJxoL+XFS/m09ZW+5QLmS3nJxJq4kiqoW04=; b=fdNr0WyVLrp9kcNF9OcelxaXqJ085MDnGaqxuYLIDcSsQ7QuvumFrMx8cTMe/uu4n7 JyhpsgSlN1WKDGiul8rfrWUKwXyNmMPOvj/Gvmku2M66jSZifjXPKA3ViXz30F1sBQYy l2xRJPEvcmh4HPHQYopGBRsguA6S9zAssEK7WW5R5Y20o2ylfRQ0vSZK1KEsLkia3t55 dWVUPnmUQNVWidI3TeoIDZOFs2IrZLVADwRaIu+t/N31udbdW/c/5hTzUTEU8IyiOark 40D2o9/dk9AVdtWeIaECfUFpXyovZqOyvhZGpJ08wg4g2PBgZueciGCDPej381lecB5e kwVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3gJk3VSepJxoL+XFS/m09ZW+5QLmS3nJxJq4kiqoW04=; b=mw7xvyU9Boo6CBhT846DzUm/IrdmM11cKRFKtagPxZFxllK1dNfW8WsU1Q1tdzHV+c ACxo8MzJfkwEwoiyZjZcjdz+MzAsju8BA5z+NH42GbTm5BbitVTKBkB6rfTL4yVGhQqX pZ+6jF0NgfbWOqX/n6bHyxfslGoIBrDnEjSV7RavImGHjngSyXI7GjLFg2+Iy2BKijc/ Etd0Kei1z+vvgLylTh7+Nr0iFZmazCbtGDHY1txuEgu2JGsGo8uVukhKX9pgtPcCD79Y 2Q9M5XouD+6WvSnPbWnTbDMFzWgptCZ+K+5pDBCqzv3I6Es0lBQaL10VNReFZYH+cdpr RruA== X-Gm-Message-State: AOPr4FVfk/PEaWOkLqY6soFrPSdRQlyfWsUaKgHiMrshY9S5iftu/x8fT4b74KWhu3sQ/+7H X-Received: by 10.194.111.229 with SMTP id il5mr15136495wjb.82.1462446608372; Thu, 05 May 2016 04:10:08 -0700 (PDT) Received: from sven-desktop.home.narfation.org (p200300C593C34EFD0000000000002E16.dip0.t-ipconnect.de. [2003:c5:93c3:4efd::2e16]) by smtp.gmail.com with ESMTPSA id 8sm2659194wms.14.2016.05.05.04.10.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 May 2016 04:10:07 -0700 (PDT) From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 5 May 2016 13:09:45 +0200 Message-Id: <1462446587-5304-8-git-send-email-sven.eckelmann@open-mesh.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1462446587-5304-1-git-send-email-sven.eckelmann@open-mesh.com> References: <1462446587-5304-1-git-send-email-sven.eckelmann@open-mesh.com> Subject: [B.A.T.M.A.N.] [PATCH v5 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" 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 */