From patchwork Wed Oct 15 02:32:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "He, Guocai (CN)" X-Patchwork-Id: 72354 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31D5DCCD18E for ; Wed, 15 Oct 2025 02:33:09 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.6597.1760495579352772170 for ; Tue, 14 Oct 2025 19:32:59 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@windriver.com header.s=PPS06212021 header.b=EWPqLWfq; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=23831c5e59=guocai.he.cn@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 59F2UGfu1613797 for ; Wed, 15 Oct 2025 02:32:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=PPS06212021; bh=c0N7cN4m84AuohwbdGiQ5zM8ScGhYmAnhpQKpbRjMRg=; b=EWPqLWfq62V+ xVLTngenvsx4biveO8COncb6Y1o+Ys0c6FQFIUqQ9n24CO4+MlIVeDJj1euoRdUx dH0m/rB9ij4T0tlgg3DBWrARnXnr2WPOHBORJtmz/26IszuwgbhCluAN+ClL971v VsjouQZ/4S17ypjPCtd9s8/W3AGqF8xvjNGPwATm0nida1Z5U1W73OE710K+fMRH Ky1lck8nVHYDpGuBoprdsMPpFj26NYXqhjdROKWwAY9byA9/u//SvuEHE4c13ZbE QYIYZp5S5rWaNtWJ90gzsT9lPKHpR+Xv1WxJeULDRF29G6vYfNz8nju+jlsj4bCe uKBPztxntw== Received: from sn4pr0501cu005.outbound.protection.outlook.com (mail-southcentralusazon11011057.outbound.protection.outlook.com [40.93.194.57]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 49qcewm9vn-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 15 Oct 2025 02:32:57 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ITaoRMdrGrKOu8N18PVaHl2iDw4juPN9kyVa9X6KdEzBOncDyqw6ovxR9oNN1HA0D+ak/ohFAOSUJaYqtehUsYPrSMQjRk/8JjyUAtpDChDpGM1uADcb68oGJgf97Hfkbz0M4DhsEm09r5R7GCqG2G/8ziqErcP31hVPrejNuZAh1h7pLz3WGRTN1ZwDagWhdyvGxoQ9vSdMBFr8jeTode2r16wPfWHpFH4kNA9N3JEnIibNphfxfsHzWptrFwVz2ig0Gw283bsUXuAyiEAOvtvdY6cQT5HTld09C7/ZKfdHqQW/jv2eZsMyHsMwJ+kvTr4exLQekXc/km19H4wOyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=c0N7cN4m84AuohwbdGiQ5zM8ScGhYmAnhpQKpbRjMRg=; b=BKewr/K9RJbqnfiZNo++6Tpz5sVNXG3r/89ktPFE54K1f2D92DvQrjMvSNzNO04z7Iwo/5XiEZJLkJUgQKREP3AtkoZ7CUVW275R4lUSGsV8wPHFhLgAQxmq2qsQC4Kgph/tE+IS5LGnDk9LoOfKEANf0vBhTtJrg2yU8HlFC9OP2ACztJru+ywWwFruVgpf/SmwNIKxz4FI1aAMu0YtRnH1dv5huPeKE43ZskLFI9H0rjqujTsQsChJ4jV9UcgfGQryuU9bUXsQ07gZaqMz99v4di+3aP0q2Eekzwgm05uMpMYM5PpWQ8vsKjxcnCCs7CxS9vdy94Hzgb+nnYVNlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO6PR11MB5586.namprd11.prod.outlook.com (2603:10b6:5:35d::21) by MW3PR11MB4700.namprd11.prod.outlook.com (2603:10b6:303:2d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9228.10; Wed, 15 Oct 2025 02:32:55 +0000 Received: from CO6PR11MB5586.namprd11.prod.outlook.com ([fe80::89ea:ecfa:c345:3fc6]) by CO6PR11MB5586.namprd11.prod.outlook.com ([fe80::89ea:ecfa:c345:3fc6%6]) with mapi id 15.20.9203.009; Wed, 15 Oct 2025 02:32:55 +0000 From: guocai.he.cn@windriver.com To: skandigraun@gmail.com, openembedded-devel@lists.openembedded.org Subject: [oe][meta-oe][kirkstone][PATCH V2] libnet: backport patch to remove configure time SOCK_PACKET check Date: Wed, 15 Oct 2025 10:32:39 +0800 Message-Id: <20251015023239.2742022-1-guocai.he.cn@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <9d4fbe3f-f7e0-4e2c-a5ea-ce2fe9387d39@gmail.com> References: <9d4fbe3f-f7e0-4e2c-a5ea-ce2fe9387d39@gmail.com> X-ClientProxiedBy: TYCP286CA0028.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:263::15) To CO6PR11MB5586.namprd11.prod.outlook.com (2603:10b6:5:35d::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5586:EE_|MW3PR11MB4700:EE_ X-MS-Office365-Filtering-Correlation-Id: 2fb47bec-fd29-4bdb-17bb-08de0b93255b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?QWwLyvSAxHq2qay4yK+/Qj7R9AjupCJ?= =?utf-8?q?SGpovqbJihljoLElASvBJB5urfT2t5i0kBcS2hRWIzmJZiqfAs+aKFubLofAouUiB?= =?utf-8?q?mg2WrRhuaJsRAO/B7bmShabrlMas9KIdC+wZ3UHmLxerEuYD68gtknQqztTfmmYfY?= =?utf-8?q?pm5ydQxZUbcu1GHYRDRlrPq+lA2r0CTnQV0ujGzfoOq1C/W9zWkzmGSZ5lyqllahQ?= =?utf-8?q?p0APN6JaH4RfkkYmpwPIQxwffyWEYbSk7NtCnxcwRaU6ZNjPslA6rEst8eFnW8BB/?= =?utf-8?q?vRhbhdxtn0J6agRsSmsGsTDc9G/FTrhCNemKvR9OUDACZQ+KIteGIuWehhl1GgZnT?= =?utf-8?q?wDAlKKiT6RPpg7/VXGkJ7Q64Lhv3pbIr7fBxFKFZK2z68TISeq5b9+wF3j9xvHBll?= =?utf-8?q?AVo8p279E9t0eSHcmKTvylo3Z8GcEentuyCwZAaje9WSeZ47FY3AVM8/xFwgJ4Fix?= =?utf-8?q?/1ya7TaJh2Bn7SOr+Z4OIWebBpfwusOEsp9i3UzQvrvICPi4mVz0F3nC2ab5Xgu+/?= =?utf-8?q?iDgRZ2cKZ3ylMx1SgYg5RAi4UrTZqLja4sanDE/6mfNym0LnxD2FC/hQ43+wM/+DK?= =?utf-8?q?y7zctj+9qdQE2V4QrRZPn5ysO1xCtTiqgNc5DDyk6FAYVhdKPw68khhAwaOYUXzsw?= =?utf-8?q?33EV1nWE8X/3ArrUiU7lWWEJZBalHbkVr8jh9cQKImyjEzwyGqK5ws3xSTUshX+wi?= =?utf-8?q?lBKmDqpnAXsvvpDQz6trIDigQJO7Ti/jNg2IiNQj5HM7R6OAohLSjbPKoX7ZoUUZr?= =?utf-8?q?crl4IB6resg6Uax//63ok/bQCY7JOKLhL3XgUkdq2J1zMoTu+eP97iJUp1x0bO9r7?= =?utf-8?q?OVDQ8RQDxxaPkgnHSjZJPsrAZiWU1tUf99SNVYcSeRZVe8eJJe99rl2Zi4gt6jMwQ?= =?utf-8?q?TjazlrwD08EzcYAOvJCg0YZMRdjjw8xnRVe3GK6Ii1gQvLDrFoEPwJgxsyQpq+3il?= =?utf-8?q?p7KMdhVwYMu6TLAktYap09k8UHREDXVjegr6vZKIEW0X1AuABIIeVgmqGGsvnjLwn?= =?utf-8?q?qATLdSWNMmRDdswF6aZwDdghM/D/n6SEHlFOs20jleIMIiDVRLLnCjlAOdidp0c7a?= =?utf-8?q?lvQX3wKKRIqpK9EM7296y7+3a2nc8PBSuHyh0OMjNAn3nFHJEH40iVfnyW04EsWKn?= =?utf-8?q?QLbrsPSFpbV64CTXAxFWEOLHrQloaLrJ5dAYPWo5S2SgsGfA1YDcTMw3kkERb4hN2?= =?utf-8?q?shtrJXhVcn3AD2kZ+Y9oClEUvUPldvSavEHgZkb2YXAd8X1Dikk1rZhQyC5HGTKrC?= =?utf-8?q?+GmGwgmQ8ueLU9ql2WzrMe8wZha0/dToq5FyhNpmtUJ90UZwKJ8wZv3gSnrGFfkEk?= =?utf-8?q?sQaYY5Df7aG70sXIKYJylCrssNCr1/kyqcXWEuArP3eddF61AhRBMtk3AWw9wfXbV?= =?utf-8?q?rsCTHngw8VK11jMmHqCGBWzeha8JIaUWjvDIkDGQ3GrAwyLsfN1CJ5Q9jVUFQ9Qst?= =?utf-8?q?t5CzTQ93R1?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR11MB5586.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?vQh7VEp6d23Aa8Ty8pw1UWGf+2AR?= =?utf-8?q?h08pT1oPKwV1rlvUvsIofVzELdtUJFC1AKl8BVmkc1by5BjtFXroHWBypmmmQV/tP?= =?utf-8?q?iLwSOU26Azo5tUyTsKKz5WAuA5THcIVOMP7pg/3qtwanMKroBENF1Ugt8nMm743X0?= =?utf-8?q?yBKrdoN12N5UXXmEZPGN7lejt3AzyFIrw6Ph+hke7yfpSrbULqDgPD1k2CKNLKwPZ?= =?utf-8?q?M/Yw35foT+/WOxhYmfUo1InCbBVsXAMLqH0p4SWpey5p90Zu2nv5CVC0q6qps0m2L?= =?utf-8?q?zNTg2HiRqIB69V0jRxGiTKfxGnKvuXdZnHLS6qOUSoMRComr12V10DM37sqWQt4b0?= =?utf-8?q?xiv3ZrWUtLW81xNZT8AIAGKj1mPvhBScHAJIZMV0M+z7CUAMSKkOdhy8vqQv90Dnn?= =?utf-8?q?LcgqyVY2zxIcnXZ4UxkBJDOpiqPfJQ7e7oZ6F6O772W1Ad/9kEL+LoWQtzn6i9qC0?= =?utf-8?q?uHNBzUrMf1FFAUSLqztZGBzXPTjwL64A8XIIyoH+CwS6h5yqJdan2MSYp8cbIlxtx?= =?utf-8?q?SGzywkJo7abafiQhHpOVs3gGLVGFaF7LoSzjWERfl12WfC+EqtcKpb8xvyxiYDFjD?= =?utf-8?q?SyjpjPA15P4CnC6I38WUEPLVgU5MJMlpTChET8IzGJHQmTiDIFdnB47vVGgmAyECe?= =?utf-8?q?tyBmB6tPkA5SJJv7E2HGGmbrxYaC6rf7D0C/Ho4TFyTCLGPGAylmuSh+E7MEoRfqG?= =?utf-8?q?8d+jkMJeP1YYDEVet4PtHq1Spq18sfBLC52kDcIh265MJox4+LmDnQt4OqXOIPpHU?= =?utf-8?q?OPk18iTdZk1KOIGoX+4t6xJHCjtx6zXUdukcqK92gpeDMpjgF/8BLn8Q3sI1g+Yba?= =?utf-8?q?61soRXBnqBp/KsHoHZ793ZOJuWtAkuMGV5pcsR5OGlI7HfGpBQnl9yQ/tcpSKyBK8?= =?utf-8?q?MZUoWjSYud+hINnaQDRC6f03yoqjuXuFkbWA66nHuydE3CXlaSwMqU2Js8Y4/KF/e?= =?utf-8?q?3VpczSgEP19m1JSO+e1dQgZvayESEqizBp8HXKiEjf+MYg8MksUUnK15QOCl+JoWz?= =?utf-8?q?f3niv0sZEGZ+UUs98ei8n8HEb/e1fZmfhQyJ+aG33GBkshr60D/UDZSF7MUWquZrI?= =?utf-8?q?3slLewofbKJ/PBgtCZcf+xtw5sX377JTLktjwLkKpKrQI9yaAKa9LfCHbFgtHqtOk?= =?utf-8?q?P6zvfQqOWL6V9eDrmn0e4uiFyli2A4M/+eX/68o+1QQ9kNQpSANyeAytEKSAuhBEt?= =?utf-8?q?TtWKYdPfTFlv/hmUWwZompfn6U2Q3h66s9RtE7Mm3uy1++/gVfv/ID0D/pJRPJWOd?= =?utf-8?q?Hg/4nqPyd3PDUayG3GwpPR3r4vOUpPTfsUg/RcldBuX2oGmwrGbE0A4GiMfcJ0tsX?= =?utf-8?q?bOOo951UPWHeRfyAnylrysw2FTDiQeFaq3gyT/9rV9n7TEHaEh7YYV9O4NI7xUfUP?= =?utf-8?q?+WzI9w/UiaNgAtoHBbn4Pzd1ROtuU4I9tttsa1yfQxHeIdsiQ7UCulFmH0shR0z7c?= =?utf-8?q?naHzGH/SYv2Ql3qzafsDLglwViDMCqvO8WJvOtPJGur7eujsk4+RuPpX1QWpxYfVC?= =?utf-8?q?tOeqN61RtsvqErPB8IhGB/OyZAA/XZD1hw=3D=3D?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fb47bec-fd29-4bdb-17bb-08de0b93255b X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5586.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2025 02:32:55.3387 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EdXT33na1NHDk2BE3rVKvbizhKprXNdlVDEjUeFZz6omT6XChhnHwC13T4Yzb3sjBmkwSutXXx8mXG+t/Ctqz8rUetwIqtfYy/EHO2UxKTE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4700 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: 9T3si3uVpUZAEzLey0dE4Em4Umdr-jjB X-Proofpoint-ORIG-GUID: ogjHWnCVMwvs3NeSHlmPvCtRdy4sPh8Q X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDE1MDAxNiBTYWx0ZWRfXxwQaO/v06tbF FOgy0/2A/ApaUY6w/PYfecR7CV3fWOJIgTi07JqAgcBqSqLQmU96VEbGqCHSXmxYvPPrCkBDBjH GvtQuJJenkjIuF91hHAhd2fn7yu7zxfmKvIOSaVnRvcSEdPgFeuCm9fL+IkimZQZcFh8eEF+yyw SAXgTnO17KjWh1/nwVxzDQfii2bdu42aAiLEboRhX6wq6IAJpsX+F+Z5vlvGs1n7XnjoOBAfLeV oQoXoqPhUfMy/7up017rz9FjDi0DlJdSkSm467j2yV8Hmg+1uUK/WOrvY7EM06qxkiUS0cRiJ7V l23OMjzuE+4ZqsBjfLg6rILQVVBskiKGbV+/O13eZBaZu2C1SH/XUgWAtnS8y7KlvtqZ8IO/ITy 9lnZqBS4mmduplvlYwlc0me7XzmFjA== X-Authority-Analysis: v=2.4 cv=M+xA6iws c=1 sm=1 tr=0 ts=68ef07da cx=c_pps a=vEsArsaSdKs0mJrCYyxDvw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=WQhEN21ruoYlkoZ7464A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-15_01,2025-10-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 suspectscore=0 adultscore=0 phishscore=0 impostorscore=0 bulkscore=0 lowpriorityscore=0 spamscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510020000 definitions=main-2510150016 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 59F2UGfu1613797 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 15 Oct 2025 02:33:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/120678 From: Guocai He Backport [1] to fix the do_configure error like below: checking for packet socket (PF_PACKET)... ./pf_packet-test: /lib/x86_64-linux-gnu/libc.so.6: version 'GLIBC_2.34' not found [1] https://github.com/libnet/libnet/commit/19979c4541ddcc817c64ea911a309ee71a8cc250 Signed-off-by: Qi Chen Signed-off-by: Guocai He --- V2: Correct the mail client's settings about charset --- ...move-support-for-SOCK_PACKET-sockets.patch | 251 ++++++++++++++++++ .../libnet/libnet_1.2-rc3.bb | 1 + 2 files changed, 252 insertions(+) create mode 100644 meta-oe/recipes-connectivity/libnet/libnet/0001-Remove-support-for-SOCK_PACKET-sockets.patch diff --git a/meta-oe/recipes-connectivity/libnet/libnet/0001-Remove-support-for-SOCK_PACKET-sockets.patch b/meta-oe/recipes-connectivity/libnet/libnet/0001-Remove-support-for-SOCK_PACKET-sockets.patch new file mode 100644 index 0000000000..2fc7ecd180 --- /dev/null +++ b/meta-oe/recipes-connectivity/libnet/libnet/0001-Remove-support-for-SOCK_PACKET-sockets.patch @@ -0,0 +1,251 @@ +From dd77c43a9773edb895bfe9074315e83a19cac471 Mon Sep 17 00:00:00 2001 +From: Guocai He +Date: Tue, 26 Aug 2025 06:15:41 +0000 +Subject: [PATCH] Remove support for SOCK_PACKET sockets +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The current code has a build-time check to verify that PF_PACKET sockets +are supported on Linux systems and if not, fallback on SOCK_PACKET sockets. + +The test implementation relies on FTM (Feature Test Macros) to detect +glibc and its version to include correct headers. +But, some libc such as the musl libc do not have such macros, making the +test program compilation fail and libnet fallback on SOCK_PACKET. + +Since PF_PACKET support is present in kernel for more than 20 years now, +the simplest solution and safe choice is to just drop support for +SOCK_PACKET and assume PF_PACKET is always available on any Linux system. + +Signed-off-by: Hervé Boisse + +Upstream-Status: Backport [19979c4541ddcc817c64ea911a309ee71a8cc250] + +Signed-off-by: Chen Qi +Signed-off-by: Guocai He +--- + acinclude.m4 | 87 ----------------------------------------- + configure.ac | 3 -- + src/libnet_link_linux.c | 19 +-------- + win32/config.h | 1 - + 4 files changed, 1 insertion(+), 109 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 064b582..f8ab967 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -25,93 +25,6 @@ AC_DEFUN([AC_LIBNET_LINUX_PROCFS], + [Define if you have the Linux /proc filesystem.]) + fi]) + +-dnl +-dnl Checks to see if this linux kernel has a working PF_PACKET +-dnl +-dnl usage: +-dnl +-dnl AC_LIBNET_CHECK_PF_PACKET +-dnl +-dnl results: +-dnl +-dnl HAVE_PACKET_SOCKET (DEFINED) +-dnl +- +-AC_DEFUN([AC_LIBNET_CHECK_PF_PACKET], +-[ +- AC_MSG_CHECKING(for packet socket (PF_PACKET)) +- AC_CACHE_VAL(libnet_cv_have_packet_socket, +- +- [ +- cat > pf_packet-test.c << EOF +-#include +-#include +-#include +-#include +-#include +-#include /* for the glibc version number */ +-#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 +-#include +-#include /* the L2 protocols */ +-#else +-#include +-#include +-#include /* The L2 protocols */ +-#endif +- +-#ifndef SOL_PACKET +-#define SOL_PACKET 263 +-#endif /* SOL_PACKET */ +- +-int +-main(int argc, char **argv) +-{ +- int fd; +- +- fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); +- if (fd == -1) +- { +- if (errno == EPERM) +- { +- /* user's UID != 0 */ +- printf("probably"); +- exit (EXIT_FAILURE); +- } +- printf("no"); +- exit (EXIT_FAILURE); +- } +- printf("yes"); +- exit (EXIT_SUCCESS); +-} +-EOF +- ${CC-cc} -o pf_packet-test $CFLAGS pf_packet-test.c >/dev/null 2>&1 +- +- # Oopz 4.3 BSD doesn't have this. Sorry. +- if test ! -x ./pf_packet-test ; then +- libnet_cv_have_packet_socket=choked +- else +- libnet_cv_have_packet_socket=`./pf_packet-test`; +- fi +- if test $libnet_cv_have_packet_socket = choked; then +- AC_MSG_RESULT(test program compile choked... assuming no) +- elif test $libnet_cv_have_packet_socket = yes; then +- AC_MSG_RESULT(yes) +- elif test $libnet_cv_have_packet_socket = probably; then +- AC_MSG_RESULT(test program got EPERM... assuming yes) +- elif test $libnet_cv_have_packet_socket = no; then +- AC_MSG_RESULT(no) +- fi +- +- rm -f pf_packet-test* core core.pf_packet-test +- +- ]) +- +- if test $libnet_cv_have_packet_socket = yes -o $libnet_cv_have_packet_socket = probably; then +- AC_DEFINE(HAVE_PACKET_SOCKET, 1, +- [Define if we're running on a Linux system with PF_PACKET sockets.]) +- fi +-]) +- + dnl + dnl Looks for a previous libnet version and attempts to determine which verion + dnl it is. Version 0.8 was the first version that actually knew internally +diff --git a/configure.ac b/configure.ac +index 4751f62..ad002b9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -51,7 +51,6 @@ AC_LIBNET_ENDIAN_CHECK + dnl AC_LBL_LIBRARY_NET + + AC_SUBST(ENDIANESS) +-AC_SUBST(HAVE_PACKET_SOCKET) + AC_SUBST(ADDITIONAL_LIBS) + AC_SUBST(LIBNET_CONFIG_DEFINES) + AC_SUBST(LIBNET_CONFIG_LIBS) +@@ -87,7 +86,6 @@ if test -n "${with_link_layer}"; then + snoop) AC_LIBOBJ([libnet_link_snoop]) ;; + dlpi) AC_LIBOBJ([libnet_link_dlpi]) ;; + linux) AC_LIBOBJ([libnet_link_linux]) +- AC_LIBNET_CHECK_PF_PACKET + AC_LIBNET_LINUX_PROCFS ;; + none) AC_LIBOBJ([libnet_link_none]) ;; + *) AC_MSG_ERROR([Invalid link type "${with_link_layer}"]) ;; +@@ -115,7 +113,6 @@ elif test "${ac_cv_header_sys_dlpi_h}" = "yes" ; then + elif test "${ac_cv_header_linux_socket_h}" = "yes" ; then + AC_LIBOBJ([libnet_link_linux]) + AC_MSG_RESULT(found link layer linux) +- AC_LIBNET_CHECK_PF_PACKET + AC_LIBNET_LINUX_PROCFS + elif test "${cross_compiling}" != "yes" -a -c /dev/bpf0 ; then # check again in case not readable + AC_LIBOBJ([libnet_link_bpf]) +diff --git a/src/libnet_link_linux.c b/src/libnet_link_linux.c +index 3c6df3c..1dd2a42 100644 +--- a/src/libnet_link_linux.c ++++ b/src/libnet_link_linux.c +@@ -33,13 +33,11 @@ + #include + #include + +-#if (HAVE_PACKET_SOCKET) + #ifndef SOL_PACKET + #define SOL_PACKET 263 + #endif /* SOL_PACKET */ + #include + #include /* the L2 protocols */ +-#endif /* HAVE_PACKET_SOCKET */ + + #include "../include/libnet.h" + +@@ -69,11 +67,8 @@ libnet_open_link(libnet_t *l) + return (-1); + } + +-#if (HAVE_PACKET_SOCKET) + l->fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); +-#else +- l->fd = socket(PF_INET, SOCK_PACKET, htons(ETH_P_ALL)); +-#endif ++ + if (l->fd == -1) + { + if (errno == EPERM) { +@@ -177,7 +172,6 @@ libnet_close_link(libnet_t *l) + } + + +-#if (HAVE_PACKET_SOCKET) + static int + get_iface_index(int fd, const char *device) + { +@@ -194,18 +188,12 @@ get_iface_index(int fd, const char *device) + + return ifr.ifr_ifindex; + } +-#endif +- + + int + libnet_write_link(libnet_t *l, const uint8_t *packet, uint32_t size) + { + int c; +-#if (HAVE_PACKET_SOCKET) + struct sockaddr_ll sa; +-#else +- struct sockaddr sa; +-#endif + + if (l == NULL) + { +@@ -213,7 +201,6 @@ libnet_write_link(libnet_t *l, const uint8_t *packet, uint32_t size) + } + + memset(&sa, 0, sizeof (sa)); +-#if (HAVE_PACKET_SOCKET) + sa.sll_family = AF_PACKET; + sa.sll_ifindex = get_iface_index(l->fd, l->device); + if (sa.sll_ifindex == -1) +@@ -221,10 +208,6 @@ libnet_write_link(libnet_t *l, const uint8_t *packet, uint32_t size) + return (-1); + } + sa.sll_protocol = htons(ETH_P_ALL); +-#else +- strncpy(sa.sa_data, l->device, sizeof (sa.sa_data) - 1); +- sa.sa_data[sizeof (sa.sa_data) - 1] = 0; +-#endif + + c = sendto(l->fd, packet, size, 0, + (struct sockaddr *)&sa, sizeof (sa)); +diff --git a/win32/config.h b/win32/config.h +index 926f12f..12e1ee7 100644 +--- a/win32/config.h ++++ b/win32/config.h +@@ -11,7 +11,6 @@ + #undef HAVE_HPUX11 + #undef HAVE_SOCKADDR_SA_LEN + #undef HAVE_DLPI +-#undef HAVE_PACKET_SOCKET + #undef HAVE_STRUCT_IP_CSUM + #undef HAVE_LIB_PCAP + #undef STUPID_SOLARIS_CHECKSUM_BUG +-- +2.35.5 + diff --git a/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb b/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb index 785abf66d6..5e35fc3391 100644 --- a/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb +++ b/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb @@ -10,6 +10,7 @@ PROVIDES = "libnet-1.2rc2" SRC_URI = "${SOURCEFORGE_MIRROR}/libnet-dev/${BPN}-${PV}.tar.gz \ file://0001-Support-musl-libc-remove-support-for-glibc-2.1.patch \ + file://0001-Remove-support-for-SOCK_PACKET-sockets.patch \ " SRC_URI[md5sum] = "f051e6e5bdecddb90f77c701c2ca1804"