diff options
author | Michael Brown | 2013-12-04 23:06:10 +0100 |
---|---|---|
committer | Michael Brown | 2013-12-05 01:41:49 +0100 |
commit | 17451b53e2fc696730586edb9d0a858bcc0b2ec8 (patch) | |
tree | e885da23313491fc49f6fcefaef6ac34107c146b /src/net/ipv4.c | |
parent | [settings] Explicitly separate the concept of a completed fetched setting (diff) | |
download | ipxe-17451b53e2fc696730586edb9d0a858bcc0b2ec8.tar.gz ipxe-17451b53e2fc696730586edb9d0a858bcc0b2ec8.tar.xz ipxe-17451b53e2fc696730586edb9d0a858bcc0b2ec8.zip |
[settings] Allow for IPv6 setting types in non-IPv6 builds
Allow for the existence of references to IPv6 setting types without
dragging in the whole IPv6 stack, by placing the definition of
setting_type_ipv6 in core/settings.c and providing weak stub methods
for parse_ipv6_setting() and format_ipv6_setting().
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/net/ipv4.c')
-rw-r--r-- | src/net/ipv4.c | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/src/net/ipv4.c b/src/net/ipv4.c index f0a2e4d6..5d5c3f75 100644 --- a/src/net/ipv4.c +++ b/src/net/ipv4.c @@ -590,6 +590,51 @@ struct sockaddr_converter ipv4_sockaddr_converter __sockaddr_converter = { ****************************************************************************** */ +/** + * Parse IPv4 address setting value + * + * @v type Setting type + * @v value Formatted setting value + * @v buf Buffer to contain raw value + * @v len Length of buffer + * @ret len Length of raw value, or negative error + */ +int parse_ipv4_setting ( const struct setting_type *type __unused, + const char *value, void *buf, size_t len ) { + struct in_addr ipv4; + + /* Parse IPv4 address */ + if ( inet_aton ( value, &ipv4 ) == 0 ) + return -EINVAL; + + /* Copy to buffer */ + if ( len > sizeof ( ipv4 ) ) + len = sizeof ( ipv4 ); + memcpy ( buf, &ipv4, len ); + + return ( sizeof ( ipv4 ) ); +} + +/** + * Format IPv4 address setting value + * + * @v type Setting type + * @v raw Raw setting value + * @v raw_len Length of raw setting value + * @v buf Buffer to contain formatted value + * @v len Length of buffer + * @ret len Length of formatted value, or negative error + */ +int format_ipv4_setting ( const struct setting_type *type __unused, + const void *raw, size_t raw_len, char *buf, + size_t len ) { + const struct in_addr *ipv4 = raw; + + if ( raw_len < sizeof ( *ipv4 ) ) + return -EINVAL; + return snprintf ( buf, len, "%s", inet_ntoa ( *ipv4 ) ); +} + /** IPv4 address setting */ const struct setting ip_setting __setting ( SETTING_IPv4 ) = { .name = "ip", |