sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-26 17:42:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

[Settings] Start revamping the configuration settings API.

Browse Source 
Add the concept of an abstract configuration setting, comprising a (DHCP)
tag value and an associated byte sequence.

Add the concept of a settings namespace.

Add functions for extracting string, IPv4 address, and signed and
unsigned integer values from configuration settings (analogous to
dhcp_snprintf(), dhcp_ipv4_option(), etc.).

Update functions for parsing and formatting named/typed options to work
with new settings API.

Update NVO commands and config UI to use new settings API.
This commit is contained in:
Michael Brown
2008-03-20 04:06:07 +00:00
parent 7067142fb4
commit a48b4d9948
6 changed files with 812 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/hci/commands/config_cmd.c
View File

@@ -4,28 +4,27 @@
#include <gpxe/settings.h>
#include <gpxe/settings_ui.h>
#include <gpxe/nvo.h>
extern struct nvo_block *ugly_nvo_hack;
static int config_exec ( int argc, char **argv ) {
struct config_context dummy_context;
struct settings *settings;
int rc;
if ( argc != 1 ) {
printf ( "Usage: %s\n"
if ( argc > 2 ) {
printf ( "Usage: %s [scope]\n"
"Opens the option configuration console\n", argv[0] );
return 1;
}
if ( ! ugly_nvo_hack ) {
printf ( "No non-volatile option storage available\n" );
return 1;
if ( argc == 2 ) {
settings = find_settings ( argv[1] );
if ( ! settings ) {
printf ( "No such scope \"%s\"\n", argv[1] );
return 1;
}
} else {
settings = &interactive_settings;
}
dummy_context.options = ugly_nvo_hack->options;
if ( ( rc = settings_ui ( &dummy_context ) ) != 0 ) {
if ( ( rc = settings_ui ( settings ) ) != 0 ) {
printf ( "Could not save settings: %s\n",
strerror ( rc ) );
return 1;

50
src/hci/commands/nvo_cmd.c
View File

@@ -4,33 +4,21 @@
#include <string.h>
#include <errno.h>
#include <getopt.h>
#include <gpxe/nvo.h>
#include <gpxe/dhcp.h>
#include <gpxe/settings.h>
#include <gpxe/command.h>
extern struct nvo_block *ugly_nvo_hack;
static int show_exec ( int argc, char **argv ) {
struct config_context dummy_context;
char buf[256];
int rc;
if ( ! ugly_nvo_hack ) {
printf ( "No non-volatile option storage available\n" );
return 1;
}
if ( argc != 2 ) {
printf ( "Syntax: %s <identifier>\n", argv[0] );
return 1;
}
dummy_context.options = ugly_nvo_hack->options;
if ( ( rc = show_named_setting ( &dummy_context, argv[1], buf,
sizeof ( buf ) ) ) < 0 ) {
if ( ( rc = get_named_setting ( argv[1], buf, sizeof ( buf ) ) ) < 0 ){
printf ( "Could not find \"%s\": %s\n",
argv[1], strerror ( -rc ) );
argv[1], strerror ( rc ) );
return 1;
}
@@ -39,30 +27,16 @@ static int show_exec ( int argc, char **argv ) {
}
static int set_exec ( int argc, char **argv ) {
struct config_context dummy_context;
int rc;
if ( ! ugly_nvo_hack ) {
printf ( "No non-volatile option storage available\n" );
return 1;
}
if ( argc != 3 ) {
printf ( "Syntax: %s <identifier> <value>\n",
argv[0] );
printf ( "Syntax: %s <identifier> <value>\n", argv[0] );
return 1;
}
dummy_context.options = ugly_nvo_hack->options;
if ( ( rc = set_named_setting ( &dummy_context, argv[1],
argv[2] ) ) != 0 ) {
if ( ( rc = set_named_setting ( argv[1], argv[2] ) ) != 0 ) {
printf ( "Could not set \"%s\"=\"%s\": %s\n",
argv[1], argv[2], strerror ( -rc ) );
return 1;
}
if ( nvo_save ( ugly_nvo_hack ) != 0 ) {
printf ( "Could not save options to non-volatile storage\n" );
argv[1], argv[2], strerror ( rc ) );
return 1;
}
@@ -70,24 +44,16 @@ static int set_exec ( int argc, char **argv ) {
}
static int clear_exec ( int argc, char **argv ) {
struct config_context dummy_context;
int rc;
if ( ! ugly_nvo_hack ) {
printf ( "No non-volatile option storage available\n" );
return 1;
}
if ( argc != 2 ) {
printf ( "Syntax: %s <identifier>\n",
argv[0] );
printf ( "Syntax: %s <identifier>\n", argv[0] );
return 1;
}
dummy_context.options = ugly_nvo_hack->options;
if ( ( rc = clear_named_setting ( &dummy_context, argv[1] ) ) != 0 ) {
if ( ( rc = delete_named_setting ( argv[1] ) ) != 0 ) {
printf ( "Could not clear \"%s\": %s\n",
argv[1], strerror ( -rc ) );
argv[1], strerror ( rc ) );
return 1;
}