Libinfo-517.30.1.tar.gz

[apple/libinfo.git] / gen.subproj / ether_addr.c

diff --git a/gen.subproj/ether_addr.c b/gen.subproj/ether_addr.c
index d3d1aeae06a239113dec8601fb7909352e812516..92bc1a1093a12a1e3e47c07057443903743620fa 100644 (file)
--- a/gen.subproj/ether_addr.c
+++ b/gen.subproj/ether_addr.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2008 Apple Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -44,8 +44,6 @@ static  char sccsid[] = "@(#)ether_addr.c     1.2 88/05/10 4.0NFSSRC; from 1.9 88/02
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 

-static const char ethers[] = "/etc/ethers";
-

 /*
  * Parses a line from /etc/ethers into its components.  The line has the form
  * 8:0:20:1:17:c8      krypton
 /*
  * Parses a line from /etc/ethers into its components.  The line has the form
  * 8:0:20:1:17:c8      krypton


@@ -53,136 +51,58 @@ static const char ethers[] = "/etc/ethers";
  * the corresponding hosts name.
  * Returns zero if successful, non-zero otherwise.
  */
  * the corresponding hosts name.
  * Returns zero if successful, non-zero otherwise.
  */

-int ether_line(s, e, hostname)
-       char *s;                /* the string to be parsed */
-       struct ether_addr *e;   /* ethernet address struct to be filled in */
-       char *hostname;         /* hosts name to be set */
+int
+ether_line(const char *s, struct ether_addr *e, char *hostname)

 {
 {

-       register int i;
+       int i;

        unsigned int t[6];
        
        unsigned int t[6];
        

-       i = sscanf(s, " %x:%x:%x:%x:%x:%x %s",
-           &t[0], &t[1], &t[2], &t[3], &t[4], &t[5], hostname);
-       if (i != 7) {
-               return (7 - i);
-       }
-       for (i = 0; i < 6; i++)
-               e->ether_addr_octet[i] = t[i];
-       return (0);
+       i = sscanf(s, " %x:%x:%x:%x:%x:%x %s", &t[0], &t[1], &t[2], &t[3], &t[4], &t[5], hostname);
+       if (i != 7) return (7 - i);
+
+       for (i = 0; i < 6; i++) e->ether_addr_octet[i] = t[i];
+       return 0;

 }
 
 /*
  * Converts a 48 bit ethernet number to its string representation.
  */
 }
 
 /*
  * Converts a 48 bit ethernet number to its string representation.
  */

-#define EI(i)  (unsigned int)(e->ether_addr_octet[(i)])
+#define EI(i) (unsigned int)(e->ether_addr_octet[(i)])

 char *
 char *

-ether_ntoa(e)
-       struct ether_addr *e;
+ether_ntoa(const struct ether_addr *e)

 {
        static char *s;
 
 {
        static char *s;
 

-       if (s == 0) {
+       if (s == 0)
+       {

                s = (char *)malloc(18);
                s = (char *)malloc(18);

-               if (s == 0)
-                       return (0);
+               if (s == 0) return NULL;

        }
        }

+

        s[0] = 0;
        s[0] = 0;

-       sprintf(s, "%x:%x:%x:%x:%x:%x",
-           EI(0), EI(1), EI(2), EI(3), EI(4), EI(5));
-       return (s);
+       sprintf(s, "%x:%x:%x:%x:%x:%x", EI(0), EI(1), EI(2), EI(3), EI(4), EI(5));
+       return s;

 }
 
 /*
  * Converts a ethernet address representation back into its 48 bits.
  */
 struct ether_addr *
 }
 
 /*
  * Converts a ethernet address representation back into its 48 bits.
  */
 struct ether_addr *

-ether_aton(s)
-       char *s;
+ether_aton(const char *s)

 {
        static struct ether_addr *ep;
 {
        static struct ether_addr *ep;

-       register int i;
+       int i;

        unsigned int t[6];
        
        unsigned int t[6];
        

-       if (ep == 0) {
-               ep = (struct ether_addr *)calloc(1, sizeof (struct ether_addr));
-               if (ep == 0)
-                       return (0);
-       }
-       i = sscanf(s, " %x:%x:%x:%x:%x:%x",
-           &t[0], &t[1], &t[2], &t[3], &t[4], &t[5]);
-       if (i != 6)
-           return ((struct ether_addr *)NULL);
-       for (i = 0; i < 6; i++)
-               ep->ether_addr_octet[i] = t[i];
-       return (ep);
-}
-
-/*
- * Given a host's name, this routine returns its 48 bit ethernet address.
- * Returns zero if successful, non-zero otherwise.
- */
-/* XXX need to override in netinfo */
-int ether_hostton(host, e)
-       char *host;             /* function input */
-       struct ether_addr *e;   /* function output */
-{
-       char currenthost[256];
-       char buf[512];
-       char *val = buf;
-       register int reason;
-       FILE *f;
-
-       if ((f = fopen(ethers, "r")) == NULL)
-       {
-               return (-1);
-       }
-
-       reason = -1;
-       while (fscanf(f, "%[^\n] ", val) == 1)
-       {
-               if ((ether_line(val, e, currenthost) == 0) &&
-                       (strcmp(currenthost, host) == 0))
-               {
-                       reason = 0;
-                       break;
-               }
-       }
-
-       fclose(f);
-       return (reason);
-}
-
-/*
- * Given a 48 bit ethernet address, this routine return its host name.
- * Returns zero if successful, non-zero otherwise.
- */
-/* XXX need to override in netinfo */
-int ether_ntohost(host, e)
-       char *host;             /* function output */
-       struct ether_addr *e;   /* function input */
-{
-       struct ether_addr currente;
-       char buf[512];
-       char *val = buf;
-       register int reason;
-       FILE *f;
-       
-       if ((f = fopen(ethers, "r")) == NULL)
+       if (ep == 0)

        {
        {

-               return (-1);
+               ep = (struct ether_addr *)calloc(1, sizeof (struct ether_addr));
+               if (ep == 0) return NULL;

        }
 
        }
 

-       reason = -1;
-       while (fscanf(f, "%[^\n] ", val) == 1)
-       {
-               if ((ether_line(val, &currente, host) == 0) &&
-                       (bcmp(e, &currente, sizeof(currente)) == 0))
-               {
-                       reason = 0;
-                       break;
-               }
-       }
+       i = sscanf(s, " %x:%x:%x:%x:%x:%x", &t[0], &t[1], &t[2], &t[3], &t[4], &t[5]);
+       if (i != 6) return NULL;

 
 

-       fclose(f);
-       return (reason);
+       for (i = 0; i < 6; i++) ep->ether_addr_octet[i] = t[i];
+       return ep;

 }
 }