From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 042D7C04EB8 for ; Mon, 26 Nov 2018 16:24:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B16E420664 for ; Mon, 26 Nov 2018 16:24:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uZxm6Dlg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B16E420664 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726399AbeK0DTY (ORCPT ); Mon, 26 Nov 2018 22:19:24 -0500 Received: from mail-lf1-f68.google.com ([209.85.167.68]:39099 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726253AbeK0DTY (ORCPT ); Mon, 26 Nov 2018 22:19:24 -0500 Received: by mail-lf1-f68.google.com with SMTP id n18so13998523lfh.6 for ; Mon, 26 Nov 2018 08:24:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=g6sefQQGqWf0sNzDHIx3/xmJOVDB4Nf8s92vAHKX6Go=; b=uZxm6DlgNKndUsrFcFKYaRfGFKGL6i4RtEJpubicQ9Gg8dHePc89tS82hF/ceNXa0t BTFnZu6c3cA06tTb1LJ+m05QVSKxp90pCppbeEl5GOtNvjQ426Pc6zKwVfOUx/juoCxb 6/4IL6TiusH6B9SVnR7lgXiyt6TBXzNzrFzbv2QM4fGnQMauhXU1p3guVke7AhSUhlav WSohojjCDJgKISHaaPnlbYiZzTzswc9Zn3pL5Sot9wYi2+pGVbvGQI4gRNqkurNlQojc zO9RuSBAo7J5YP278BEOQMTuqrltDf4qUdGIvEGkKIJerCZPuGIv7atUn6Ueqc+EPRu1 O2lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=g6sefQQGqWf0sNzDHIx3/xmJOVDB4Nf8s92vAHKX6Go=; b=VCMWd31EVc8qXzL5KCOR/JNA4HFM5kbAEdBHhR1X+fuos5Ko40UW4cO7/QjoVCnmv2 y/3WRZElzRcmBRRlag84CkQ284qjfKyuWaPjD91mBGD1wECZcuvxPCU7NtWIr0ronJNi YZ8Reso/ZvBTo9mvjN2VMtZAD+2ZM5J4Q6Od8qh3sv5/mOyfMYvonphUkqeNhvJ7lvbx o07BKJAJ/+E2X4+DRceDKUzBXa7AWntB0WnhsVecADQ+W0RSUcpfFqqLLHr1FyWWq9NC TJH/CjPSTVo9tC7+QooNS/MF9PGzZrS0MV2Gj2vIPSK8Q/obQK0iNAc1FmKqdwAoR6cE CRWQ== X-Gm-Message-State: AGRZ1gIkPmZ3Segu+nFL042M1zHBfYt8LAkTpdP2t3lpdRrcKeydWTvg 51h9qgBOxBvczembvIYZFK6X0Cil X-Google-Smtp-Source: AJdET5c7km1aepAUZhP8bHYYjRitLNYKXJCekeHMr9zwtKvMb+N7sPMkDnLmbKXPQqE0CC2APP95Cw== X-Received: by 2002:a19:5a05:: with SMTP id o5mr17338236lfb.140.1543249486484; Mon, 26 Nov 2018 08:24:46 -0800 (PST) Received: from localhost.localdomain (89-27-7-11.bb.dnainternet.fi. [89.27.7.11]) by smtp.gmail.com with ESMTPSA id g70-v6sm120787ljg.92.2018.11.26.08.24.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Nov 2018 08:24:45 -0800 (PST) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ 5/6] core: Remove old code related to sd_notify Date: Mon, 26 Nov 2018 18:24:37 +0200 Message-Id: <20181126162438.27872-5-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181126162438.27872-1-luiz.dentz@gmail.com> References: <20181126162438.27872-1-luiz.dentz@gmail.com> Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This is no longer needed since mainloop instances can handle it now. --- Makefile.am | 1 - Makefile.tools | 2 +- src/systemd.c | 107 ------------------------------------------------- src/systemd.h | 28 ------------- 4 files changed, 1 insertion(+), 137 deletions(-) delete mode 100644 src/systemd.c delete mode 100644 src/systemd.h diff --git a/Makefile.am b/Makefile.am index 124c32482..a69baea10 100644 --- a/Makefile.am +++ b/Makefile.am @@ -185,7 +185,6 @@ src_bluetoothd_SOURCES = $(builtin_sources) \ src/bluetooth.ver \ src/main.c src/log.h src/log.c \ src/backtrace.h src/backtrace.c \ - src/systemd.h src/systemd.c \ src/rfkill.c src/hcid.h src/sdpd.h \ src/sdpd-server.c src/sdpd-request.c \ src/sdpd-service.c src/sdpd-database.c \ diff --git a/Makefile.tools b/Makefile.tools index 35412ca61..d3d901bc9 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -46,7 +46,7 @@ endif if LOGGER libexec_PROGRAMS += tools/btmon-logger -tools_btmon_logger_SOURCES = tools/btmon-logger.c src/systemd.c src/systemd.h +tools_btmon_logger_SOURCES = tools/btmon-logger.c tools_btmon_logger_LDADD = src/libshared-mainloop.la tools_btmon_logger_DEPENDENCIES = src/libshared-mainloop.la \ tools/bluetooth-logger.service diff --git a/src/systemd.c b/src/systemd.c deleted file mode 100644 index 0a4b35d06..000000000 --- a/src/systemd.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * - * BlueZ - Bluetooth protocol stack for Linux - * - * Copyright (C) 2012 Intel Corporation. All rights reserved. - * - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "systemd.h" - -int sd_listen_fds(int unset_environment) -{ - return 0; -} - -int sd_notify(int unset_environment, const char *state) -{ - const char *sock; - struct sockaddr_un addr; - struct msghdr msghdr; - struct iovec iovec; - int fd, err; - - if (!state) { - err = -EINVAL; - goto done; - } - - sock = getenv("NOTIFY_SOCKET"); - if (!sock) - return 0; - - /* check for abstract socket or absolute path */ - if (sock[0] != '@' && sock[0] != '/') { - err = -EINVAL; - goto done; - } - - fd = socket(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0); - if (fd < 0) { - err = -errno; - goto done; - } - - memset(&addr, 0, sizeof(addr)); - addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, sock, sizeof(addr.sun_path) - 1); - - if (addr.sun_path[0] == '@') - addr.sun_path[0] = '\0'; - - memset(&iovec, 0, sizeof(iovec)); - iovec.iov_base = (char *) state; - iovec.iov_len = strlen(state); - - memset(&msghdr, 0, sizeof(msghdr)); - msghdr.msg_name = &addr; - msghdr.msg_namelen = offsetof(struct sockaddr_un, sun_path) + - strlen(sock); - - if (msghdr.msg_namelen > sizeof(struct sockaddr_un)) - msghdr.msg_namelen = sizeof(struct sockaddr_un); - - msghdr.msg_iov = &iovec; - msghdr.msg_iovlen = 1; - - if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) - err = -errno; - else - err = 1; - - close(fd); - -done: - if (unset_environment) - unsetenv("NOTIFY_SOCKET"); - - return err; -} diff --git a/src/systemd.h b/src/systemd.h deleted file mode 100644 index 0ef7c82a9..000000000 --- a/src/systemd.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * - * BlueZ - Bluetooth protocol stack for Linux - * - * Copyright (C) 2012 Intel Corporation. All rights reserved. - * - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#define SD_LISTEN_FDS_START 3 - -int sd_listen_fds(int unset_environment); - -int sd_notify(int unset_environment, const char *state); -- 2.17.2