diff options
Diffstat (limited to 'inet')
| -rw-r--r-- | inet/ether_line.c | 10 | ||||
| -rw-r--r-- | inet/tst-ether_aton.c | 62 |
2 files changed, 50 insertions, 22 deletions
diff --git a/inet/ether_line.c b/inet/ether_line.c index d9ad918905..7e871a6bd7 100644 --- a/inet/ether_line.c +++ b/inet/ether_line.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1999, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -46,7 +46,7 @@ ether_line (const char *line, struct ether_addr *addr, char *hostname) if ((ch < '0' || ch > '9') && (ch < 'a' || ch > 'f')) return -1; number <<= 4; - number = isdigit (ch) ? (ch - '0') : (ch - 'a' + 10); + number += isdigit (ch) ? (ch - '0') : (ch - 'a' + 10); ch = *line; if (cnt < 5 && ch != ':') @@ -65,15 +65,15 @@ ether_line (const char *line, struct ether_addr *addr, char *hostname) cp = __strchrnul (line, '#'); while (cp > line && isspace (cp[-1])) --cp; - *cp = '\0'; - if (*line == '\0') + if (cp == line) /* No hostname. */ return -1; /* XXX This can cause trouble because the hostname might be too long but we have no possibility to check it here. */ - strcpy (hostname, line); + memcpy (hostname, line, cp - line); + hostname [cp - line] = '\0'; return 0; } diff --git a/inet/tst-ether_aton.c b/inet/tst-ether_aton.c index 24718f48de..94ceec80ff 100644 --- a/inet/tst-ether_aton.c +++ b/inet/tst-ether_aton.c @@ -1,29 +1,57 @@ #include <stdio.h> +#include <string.h> #include <netinet/ether.h> int main (int argc, char *argv[]) { - struct ether_addr *val; - int result; + struct ether_addr *valp, val; + int result, r; + char hostname[32], buf[64], *p; - val = ether_aton ("12:34:56:78:9a:bc"); + valp = ether_aton ("12:34:56:78:9a:bc"); printf ("ether_aton (\"12:34:56:78:9a:bc\") = %hhx:%hhx:%hhx:%hhx:%hhx:%hhx\n", - val->ether_addr_octet[0], - val->ether_addr_octet[1], - val->ether_addr_octet[2], - val->ether_addr_octet[3], - val->ether_addr_octet[4], - val->ether_addr_octet[5]); - - - result = (val->ether_addr_octet[0] != 0x12 - || val->ether_addr_octet[1] != 0x34 - || val->ether_addr_octet[2] != 0x56 - || val->ether_addr_octet[3] != 0x78 - || val->ether_addr_octet[4] != 0x9a - || val->ether_addr_octet[5] != 0xbc); + valp->ether_addr_octet[0], + valp->ether_addr_octet[1], + valp->ether_addr_octet[2], + valp->ether_addr_octet[3], + valp->ether_addr_octet[4], + valp->ether_addr_octet[5]); + + result = (valp->ether_addr_octet[0] != 0x12 + || valp->ether_addr_octet[1] != 0x34 + || valp->ether_addr_octet[2] != 0x56 + || valp->ether_addr_octet[3] != 0x78 + || valp->ether_addr_octet[4] != 0x9a + || valp->ether_addr_octet[5] != 0xbc); + + if ((r = ether_line ("0:c0:f0:46:5f:97 host.ether.com \t# comment", + &val, hostname)) == 0) + { + ether_ntoa_r (&val, buf); + p = strchr (buf, '\0'); + *p++ = ' '; + strcpy (p, hostname); + + printf ("ether_line (\"0:c0:f0:46:5f:97 host.ether.com\") = \"%s\"\n", + buf); + + result |= strcmp ("0:c0:f0:46:5f:97 host.ether.com", buf) != 0; + } + else + { + printf ("ether_line (\"0:c0:f0:46:5f:97 host.ether.com\") = %d\n", r); + result |= 1; + } + + r = ether_line ("0:c0:2:d0 foo.bar ", &val, hostname); + printf ("ether_line (\"0:c0:2:d0 foo.bar \") = %d\n", r); + result |= r != -1; + + r = ether_line ("0:c0:2:d0:1a:2a ", &val, hostname); + printf ("ether_line (\"0:c0:2:d0:1a:2a \") = %d\n", r); + result |= r != -1; return result; } |