diff options
| author | Michael Brown | 2015-04-24 15:34:32 +0200 |
|---|---|---|
| committer | Michael Brown | 2015-04-24 15:41:32 +0200 |
| commit | 9aa8090d069eb0b36769f33544faf0e7e429e844 (patch) | |
| tree | 02dd0bdc5afca6e625f2f6c73fd85244ab020093 /src/drivers/net | |
| parent | [test] Include IPv6 support when performing settings self-tests (diff) | |
| download | ipxe-9aa8090d069eb0b36769f33544faf0e7e429e844.tar.gz ipxe-9aa8090d069eb0b36769f33544faf0e7e429e844.tar.xz ipxe-9aa8090d069eb0b36769f33544faf0e7e429e844.zip | |
[base16] Add buffer size parameter to base16_encode() and base16_decode()
The current API for Base16 (and Base64) encoding requires the caller
to always provide sufficient buffer space. This prevents the use of
the generic encoding/decoding functionality in some situations, such
as in formatting the hex setting types.
Implement a generic hex_encode() (based on the existing
format_hex_setting()), implement base16_encode() and base16_decode()
in terms of the more generic hex_encode() and hex_decode(), and update
all callers to provide the additional buffer length parameter.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/drivers/net')
| -rw-r--r-- | src/drivers/net/ecm.c | 2 | ||||
| -rw-r--r-- | src/drivers/net/netfront.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/net/ecm.c b/src/drivers/net/ecm.c index 33f80e02b..8c84ea9e9 100644 --- a/src/drivers/net/ecm.c +++ b/src/drivers/net/ecm.c @@ -105,7 +105,7 @@ int ecm_fetch_mac ( struct usb_device *usb, return -EINVAL; /* Decode MAC address */ - len = base16_decode ( buf, hw_addr ); + len = base16_decode ( buf, hw_addr, ETH_ALEN ); if ( len < 0 ) { rc = len; return rc; diff --git a/src/drivers/net/netfront.c b/src/drivers/net/netfront.c index 6a1e4fc1f..2f4bbf2a0 100644 --- a/src/drivers/net/netfront.c +++ b/src/drivers/net/netfront.c @@ -139,7 +139,7 @@ static int netfront_read_mac ( struct netfront_nic *netfront, void *hw_addr ) { xendev->key, mac ); /* Decode MAC address */ - len = hex_decode ( mac, ':', hw_addr, ETH_ALEN ); + len = hex_decode ( ':', mac, hw_addr, ETH_ALEN ); if ( len < 0 ) { rc = len; DBGC ( netfront, "NETFRONT %s could not decode MAC address " |