X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=src%2Flib%2Fcmdline_parse_etheraddr.c;h=d718081242e276f74b14e95924fba1d8e89645f1;hb=767419072cd4dfb52541b7fe2715bbb01bc8d561;hp=94ee7cceb01b0a6ccaed9b24564278ea118c106f;hpb=c60ed50ac1449a2b2bccc33598d1f68458a36fb1;p=libcmdline.git diff --git a/src/lib/cmdline_parse_etheraddr.c b/src/lib/cmdline_parse_etheraddr.c index 94ee7cc..d718081 100644 --- a/src/lib/cmdline_parse_etheraddr.c +++ b/src/lib/cmdline_parse_etheraddr.c @@ -1,3 +1,37 @@ +/*- + * Copyright (c) <2010>, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * - Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + /* * Copyright (c) 2009, Olivier MATZ * All rights reserved. @@ -31,11 +65,7 @@ #include #include #include -#include #include -#ifdef __linux__ -#include -#endif #include "cmdline_parse.h" #include "cmdline_parse_etheraddr.h" @@ -50,8 +80,37 @@ struct cmdline_token_ops cmdline_token_etheraddr_ops = { #define ETHER_ADDRSTRLEN 18 +#ifdef __linux__ +#define ea_oct ether_addr_octet +#else +#define ea_oct octet +#endif + +static struct ether_addr * +my_ether_aton(const char *a) +{ + int i; + static struct ether_addr ether_addr; + unsigned int o0, o1, o2, o3, o4, o5; + + i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5); + + if (i != ETHER_ADDR_LEN) + return NULL; + + ether_addr.ea_oct[0] = o0; + ether_addr.ea_oct[1] = o1; + ether_addr.ea_oct[2] = o2; + ether_addr.ea_oct[3] = o3; + ether_addr.ea_oct[4] = o4; + ether_addr.ea_oct[5] = o5; + + return (struct ether_addr *)ðer_addr; +} + int -cmdline_parse_etheraddr(cmdline_parse_token_hdr_t *tk, const char *buf, void *res) +cmdline_parse_etheraddr(__attribute__((unused)) cmdline_parse_token_hdr_t *tk, + const char *buf, void *res) { unsigned int token_len = 0; char ether_str[ETHER_ADDRSTRLEN]; @@ -70,7 +129,7 @@ cmdline_parse_etheraddr(cmdline_parse_token_hdr_t *tk, const char *buf, void *re snprintf(ether_str, token_len+1, "%s", buf); - tmp = ether_aton(ether_str); + tmp = my_ether_aton(ether_str); if (tmp == NULL) return -1; @@ -78,8 +137,8 @@ cmdline_parse_etheraddr(cmdline_parse_token_hdr_t *tk, const char *buf, void *re return token_len; } -int cmdline_get_help_etheraddr(cmdline_parse_token_hdr_t *tk, char *dstbuf, - unsigned int size) +int cmdline_get_help_etheraddr(__attribute__((unused)) cmdline_parse_token_hdr_t *tk, + char *dstbuf, unsigned int size) { snprintf(dstbuf, size, "Ethernet address"); return 0;