From patchwork Thu Apr 16 17:55:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Daniel M. Weeks" X-Patchwork-Id: 1271832 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4936Rn4JnQz9sWS for ; Fri, 17 Apr 2020 03:59:17 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=rpi.edu Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4936Rm6QbpzDqkS for ; Fri, 17 Apr 2020 03:59:16 +1000 (AEST) X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=rpi.edu (client-ip=128.113.2.230; helo=smtp10.server.rpi.edu; envelope-from=weeksd2@rpi.edu; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=rpi.edu Received: from smtp10.server.rpi.edu (smtp10.server.rpi.edu [128.113.2.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4936Mr3fyWzDsM2 for ; Fri, 17 Apr 2020 03:55:52 +1000 (AEST) Received: from smtp-auth1.server.rpi.edu (route.canit.rpi.edu [128.113.2.231]) by smtp10.server.rpi.edu (8.14.4/8.14.4/Debian-8+deb8u2) with ESMTP id 03GHtl1p096325 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 16 Apr 2020 13:55:47 -0400 Received: from smtp-auth1.server.rpi.edu (localhost [127.0.0.1]) by smtp-auth1.server.rpi.edu (Postfix) with ESMTP id 113A758108 for ; Thu, 16 Apr 2020 13:55:47 -0400 (EDT) Received: from dev.danweeks.net (cpe-74-70-107-6.nycap.res.rr.com [74.70.107.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: weeksd2) by smtp-auth1.server.rpi.edu (Postfix) with ESMTPSA id E492F58104 for ; Thu, 16 Apr 2020 13:55:46 -0400 (EDT) Date: Thu, 16 Apr 2020 13:55:41 -0400 From: "Daniel M. Weeks" To: petitboot@lists.ozlabs.org Subject: [PATCH 08/11] New function to compare hardware addresses Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Virus-Scanned: ClamAV using ClamSMTP X-Bayes-Prob: 0.0001 (Score 0, tokens from: outgoing, @@RPTN) X-Spam-Score: 0.00 () [Hold at 10.10] X-CanIt-Incident-Id: 032rtTLFA X-CanIt-Geo: ip=74.70.107.6; country=US; region=New York; city=Troy; latitude=42.7273; longitude=-73.6696; http://maps.google.com/maps?q=42.7273,-73.6696&z=6 X-CanItPRO-Stream: outgoing X-Canit-Stats-ID: Bayes signature not available X-Scanned-By: CanIt (www . roaringpenguin . com) on 128.113.2.230 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" This simplifies comparing hardware address buffers when they may be of different lengths. Signed-off-by: Daniel M. Weeks --- lib/util/util.c | 13 +++++++++++++ lib/util/util.h | 3 +++ 2 files changed, 16 insertions(+) diff --git a/lib/util/util.c b/lib/util/util.c index a18926c..e672d19 100644 --- a/lib/util/util.c +++ b/lib/util/util.c @@ -47,3 +47,16 @@ void mac_str(uint8_t *mac, unsigned int maclen, char *buf, unsigned int buflen) return; } + +int hwaddr_cmp(uint8_t *hwaddr1, size_t hwaddr1_len, uint8_t *hwaddr2, size_t hwaddr2_len) +{ + /* emulate memcmp even though it's unnecessary */ + + if (hwaddr1_len > hwaddr2_len) + return 1; + + if (hwaddr1_len < hwaddr2_len) + return -1; + + return memcmp(hwaddr1, hwaddr2, hwaddr1_len); +} diff --git a/lib/util/util.h b/lib/util/util.h index 39966d0..416e1af 100644 --- a/lib/util/util.h +++ b/lib/util/util.h @@ -18,6 +18,7 @@ #ifndef UTIL_H #define UTIL_H +#include #include #ifndef container_of @@ -51,5 +52,7 @@ void mac_str(uint8_t *mac, unsigned int maclen, char *buf, unsigned int buflen); +int hwaddr_cmp(uint8_t *hwaddr1, size_t hwaddr1_len, uint8_t *hwaddr2, size_t hwaddr2_len); + #endif /* UTIL_H */