{"id":808612,"url":"http://patchwork.ozlabs.org/api/patches/808612/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504260847-5408-2-git-send-email-pablo@netfilter.org/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504260847-5408-2-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-01T10:14:06","name":"[nft,2/3] netlink: remove nfsock_open()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"f335210c3a5e957e1d7c0a4e9041975cf61ef0b8","submitter":{"id":1315,"url":"http://patchwork.ozlabs.org/api/people/1315/?format=json","name":"Pablo Neira Ayuso","email":"pablo@netfilter.org"},"delegate":{"id":6139,"url":"http://patchwork.ozlabs.org/api/users/6139/?format=json","username":"pablo","first_name":"Pablo","last_name":"Neira","email":"pablo@netfilter.org"},"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504260847-5408-2-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":988,"url":"http://patchwork.ozlabs.org/api/series/988/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=988","date":"2017-09-01T10:14:05","name":"[nft,1/3] src: move nf_sock into nft_ctx structure","version":1,"mbox":"http://patchwork.ozlabs.org/series/988/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808612/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808612/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netfilter-devel-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xkFTT2N85z9t32\n\tfor ;\n\tFri, 1 Sep 2017 20:14:21 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751866AbdIAKOU (ORCPT );\n\tFri, 1 Sep 2017 06:14:20 -0400","from mail.us.es ([193.147.175.20]:34332 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1751857AbdIAKOT (ORCPT );\n\tFri, 1 Sep 2017 06:14:19 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id A76A1190F87\n\tfor ;\n\tFri, 1 Sep 2017 12:13:54 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 986F17C69\n\tfor ;\n\tFri, 1 Sep 2017 12:13:54 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 8DC32B5056; Fri, 1 Sep 2017 12:13:54 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 74F5250F10;\n\tFri, 1 Sep 2017 12:13:52 +0200 (CEST)","from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int\n\t(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); \n\tFri, 01 Sep 2017 12:13:52 +0200 (CEST)","from salvia.here (129.166.216.87.static.jazztel.es\n\t[87.216.166.129]) (Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id 0DD184265A24;\n\tFri, 1 Sep 2017 12:13:51 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.1 (2015-04-28) on\n\tantivirus1-rhel7.int","X-Spam-Level":"","X-Spam-Status":"No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50,\n\tSMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1","X-Virus-Status":"clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int)","X-SMTPAUTHUS":"auth mail.us.es","From":"Pablo Neira Ayuso ","To":"netfilter-devel@vger.kernel.org","Cc":"phil@nwl.cc, eric@regit.org","Subject":"[PATCH nft 2/3] netlink: remove nfsock_open()","Date":"Fri, 1 Sep 2017 12:14:06 +0200","Message-Id":"<1504260847-5408-2-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504260847-5408-1-git-send-email-pablo@netfilter.org>","References":"<1504260847-5408-1-git-send-email-pablo@netfilter.org>","X-Virus-Scanned":"ClamAV using ClamSMTP","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"Just merge this code to netlink_open_sock().\n\nSigned-off-by: Pablo Neira Ayuso \n---\n src/netlink.c | 16 +++++-----------\n 1 file changed, 5 insertions(+), 11 deletions(-)","diff":"diff --git a/src/netlink.c b/src/netlink.c\nindex 90f8486581fe..b6336e836e88 100644\n--- a/src/netlink.c\n+++ b/src/netlink.c\n@@ -48,22 +48,16 @@ const struct location netlink_location = {\n \t.indesc\t= &indesc_netlink,\n };\n \n-static struct mnl_socket *nfsock_open(void)\n-{\n-\tstruct mnl_socket *s;\n-\n-\ts = mnl_socket_open(NETLINK_NETFILTER);\n-\tif (s == NULL)\n-\t\tnetlink_init_error();\n-\treturn s;\n-}\n-\n struct mnl_socket *netlink_open_sock(void)\n {\n \tstruct mnl_socket *nf_sock;\n \n-\tnf_sock = nfsock_open();\n+\tnf_sock = mnl_socket_open(NETLINK_NETFILTER);\n+\tif (nf_sock == NULL)\n+\t\tnetlink_init_error();\n+\n \tfcntl(mnl_socket_get_fd(nf_sock), F_SETFL, O_NONBLOCK);\n+\n \treturn nf_sock;\n }\n \n","prefixes":["nft","2/3"]}