Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1iNGFz-0006Iu-Et for mharc-grub-devel@gnu.org; Wed, 23 Oct 2019 09:00:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41046) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNGFt-0006HB-NR for grub-devel@gnu.org; Wed, 23 Oct 2019 09:00:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNGFo-0004lx-Q4 for grub-devel@gnu.org; Wed, 23 Oct 2019 09:00:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40456) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNGFo-0004jt-C9 for grub-devel@gnu.org; Wed, 23 Oct 2019 09:00:44 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 767F280F79 for ; Wed, 23 Oct 2019 13:00:43 +0000 (UTC) Received: by mail-wr1-f72.google.com with SMTP id a15so10988569wrr.0 for ; Wed, 23 Oct 2019 06:00:43 -0700 (PDT) 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=LcoBgk9mkEYipIqqMR920myD3h4uICKVxCQS7uPmTlw=; b=a06o+cDNVLmc88WtXG2GjWD92T7ZElrTGPIsmSFdMDcfTAtbnbfcphwR6KF0pc96J0 eIykZKrMXw9kxkFlceKWwlB43Ysy7JiWi9uNxcn9A1+0pjHITuZlIg9yqNURbCITIdDe ATtOwVEj12HyHCc8eMkiobqxkQOgzUl0WCPqNoWJKbZtf43qHxBs7wXa1tk99eBAPyD0 lNseAG2XE8dk6j7mAoonH0AfRDdagHRGUHK6VJOECizLx9LAIi9S88HKb4WUupFIMKN6 O0VlbihQFMQ9RVxkKt8YBr7SOUswA+eX8c6XyGv2WlTlmMCRNlDvJApsMzRj6eSUiBFf nv9Q== X-Gm-Message-State: APjAAAW4QCgrsbBTTC7vHuab0LLNWAS2D/AKTkN28uaj/AZGTUJsODOB d5Gq+CMVYb6wJKB+rekSgaWLdjwaYhLpTnQys3KPmt7DtviJoRVzybEi6FsdGiKL1O0ETgvLOEO 938+IwVKCjso= X-Received: by 2002:a1c:dc83:: with SMTP id t125mr8161425wmg.50.1571835641995; Wed, 23 Oct 2019 06:00:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqygGQKB7nGLRtuc+pEOftUGEZJTlBRHO+BBoS63b3e2FI3dOSos6jtJkLSVmAzk1ZxpYTZiDQ== X-Received: by 2002:a1c:dc83:: with SMTP id t125mr8161406wmg.50.1571835641784; Wed, 23 Oct 2019 06:00:41 -0700 (PDT) Received: from minerva.redhat.com ([90.168.169.92]) by smtp.gmail.com with ESMTPSA id t123sm27423301wma.40.2019.10.23.06.00.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 06:00:40 -0700 (PDT) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Vladimir Serbinenko , Daniel Kiper , Paulo Flabiano Smorigo , Javier Martinez Canillas Subject: [PATCH v4 2/5] net/dhcp: Consistently use decimal numbers for DHCP/BOOTP options enum Date: Wed, 23 Oct 2019 15:00:30 +0200 Message-Id: <20191023130034.12834-3-javierm@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191023130034.12834-1-javierm@redhat.com> References: <20191023130034.12834-1-javierm@redhat.com> MIME-Version: 1.0 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: 209.132.183.28 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, 23 Oct 2019 13:00:51 -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's how these values are defined by RFC 2132. Suggested-by: Daniel Kiper Signed-off-by: Javier Martinez Canillas --- Changes in v4: - Use decimal instead of hexadecimal numbers to be consistent with RFC 21= 32. 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.21.0