Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1iuDmA-00076b-B6 for mharc-grub-devel@gnu.org; Wed, 22 Jan 2020 06:02:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33892) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuDm7-00074h-R5 for grub-devel@gnu.org; Wed, 22 Jan 2020 06:02:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuDm6-0001Fp-O7 for grub-devel@gnu.org; Wed, 22 Jan 2020 06:02:19 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:30799 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iuDm6-0001Fd-Ka for grub-devel@gnu.org; Wed, 22 Jan 2020 06:02:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579690938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/uwtkG6vJMnjUGRgntOqpcmbYNXu4X/D09+MVfmmM2k=; b=GDCsjiX4Zs7bPluMFQd3P0U+Gc0oK+3cz7kYbstW5Sb1FhH7bMjhLnph1jG00ENOyyehtw kGjMH3AulxSXx5tq+2bg1hfiZyt3xScDW0AKYvYbWr0lmPeqWpZkJ20JCsmu4UqLRhcyuw nvosKTLW1fBxSgkbJEZGrGfaca/t/Rg= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-339-1HWYurUjOpOvB27bOoMoEA-1; Wed, 22 Jan 2020 06:02:16 -0500 Received: by mail-wr1-f72.google.com with SMTP id c6so2840111wrm.18 for ; Wed, 22 Jan 2020 03:02:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JIH+M9cQldrpYZ6aypBv8IIQIdYW86L4khV4T2sctBM=; b=ZN9D3uWFl8YFP7ofuWTA7scq3Y0AJKvUED5QBhG1BgOYbjM0nqHMAXwwHPt+uOUH0Z hgyCWE3umjjBYX6vfEmfImhz3u80d2IjKdbqZXwuyqhNbQGg1ba5OemseR6Jqz4PRMzg htNCTINFTGEkbOX18UNV85zgPvm/NHVwe3C4qrgpZFu4Mtl+iAI2CLmWYS4PxJ8NstBM qo0+Gp4e0IYDBAhVl1cUodl7rWYA2oOvEoKbqetPz/K6n4ga6Iie0tXbnj3EDD0pny8v 1rBLDd4v2G8tV4VgHazHDdRC8uCR8C+zlzEUgyTl6JXLQUSGkKZhybtg4MJGobyHxIRA kMpQ== X-Gm-Message-State: APjAAAVkW9ASJBgPeJalFRdkCG9I0azRxxtl/AFMBH9NlGJLc6/RRNOj HZNU2C9ocdXV6ZjuglAi+2DrVPnUAfQqCgvRNUmL/XS47KMlZNOzz1VrhEMhCR6ydqBbHCM+bcC b8bKNsFPJQak= X-Received: by 2002:a05:6000:1052:: with SMTP id c18mr10351340wrx.268.1579690935126; Wed, 22 Jan 2020 03:02:15 -0800 (PST) X-Google-Smtp-Source: APXvYqzwcIATmuduEjD6RbSzmPzq404U/Drwrc95egT0FfYmy5RKwPCFGH4fxYQoeZsAqy/AiepZWg== X-Received: by 2002:a05:6000:1052:: with SMTP id c18mr10351314wrx.268.1579690934890; Wed, 22 Jan 2020 03:02:14 -0800 (PST) Received: from minerva.redhat.com ([2a01:c50f:ab80:6700:527f:85b3:5615:ff0b]) by smtp.gmail.com with ESMTPSA id c2sm56546692wrp.46.2020.01.22.03.02.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 03:02:14 -0800 (PST) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Daniel Kiper , Paulo Flabiano Smorigo , Vladimir Serbinenko , Javier Martinez Canillas Subject: [PATCH v6 2/5] net/dhcp: Consistently use decimal numbers for DHCP/BOOTP options enum Date: Wed, 22 Jan 2020 12:01:53 +0100 Message-Id: <20200122110157.1062269-3-javierm@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200122110157.1062269-1-javierm@redhat.com> References: <20200122110157.1062269-1-javierm@redhat.com> MIME-Version: 1.0 X-MC-Unique: 1HWYurUjOpOvB27bOoMoEA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jan 2020 11:02:21 -0000 The DHCP Options and BOOTP Vendor Extensions enum values are a mixture of decimal and hexadecimal numbers. Change this to consistently use decimal numbers for all since that is how these values are defined by RFC 2132. Suggested-by: Daniel Kiper Signed-off-by: Javier Martinez Canillas Reviewed-by: Daniel Kiper --- Changes in v6: None Changes in v5: - Add Reviewed-by from Daniel Kiper to patch #2. Changes in v4: - Use decimal instead of hexadecimal numbers to be consistent with RFC 2132= . Changes in v3: - Add patch to cleanup bootp/dhcp options enum. Changes in v2: None include/grub/net.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/include/grub/net.h b/include/grub/net.h index 4a9069a1474..b5fedb28b9c 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -454,14 +454,14 @@ struct grub_net_bootp_packet =20 enum { - GRUB_NET_BOOTP_PAD =3D 0x00, - GRUB_NET_BOOTP_NETMASK =3D 0x01, - GRUB_NET_BOOTP_ROUTER =3D 0x03, - GRUB_NET_BOOTP_DNS =3D 0x06, - GRUB_NET_BOOTP_HOSTNAME =3D 0x0c, - GRUB_NET_BOOTP_DOMAIN =3D 0x0f, - GRUB_NET_BOOTP_ROOT_PATH =3D 0x11, - GRUB_NET_BOOTP_EXTENSIONS_PATH =3D 0x12, + GRUB_NET_BOOTP_PAD =3D 0, + GRUB_NET_BOOTP_NETMASK =3D 1, + GRUB_NET_BOOTP_ROUTER =3D 3, + GRUB_NET_BOOTP_DNS =3D 6, + GRUB_NET_BOOTP_HOSTNAME =3D 12, + GRUB_NET_BOOTP_DOMAIN =3D 15, + GRUB_NET_BOOTP_ROOT_PATH =3D 17, + GRUB_NET_BOOTP_EXTENSIONS_PATH =3D 18, GRUB_NET_DHCP_REQUESTED_IP_ADDRESS =3D 50, GRUB_NET_DHCP_OVERLOAD =3D 52, GRUB_NET_DHCP_MESSAGE_TYPE =3D 53, @@ -469,7 +469,7 @@ enum GRUB_NET_DHCP_PARAMETER_REQUEST_LIST =3D 55, GRUB_NET_DHCP_TFTP_SERVER_NAME =3D 66, GRUB_NET_DHCP_BOOTFILE_NAME =3D 67, - GRUB_NET_BOOTP_END =3D 0xff + GRUB_NET_BOOTP_END =3D 255 }; =20 struct grub_net_network_level_interface * --=20 2.24.1