network_cmds-245.1.3.tar.gz

[apple/network_cmds.git] / bootparams / bpwhoami.tproj / bpwhoami.c

diff --git a/bootparams/bpwhoami.tproj/bpwhoami.c b/bootparams/bpwhoami.tproj/bpwhoami.c
index c846417eb6753b30517b89b1b3bc65291edc76a9..e0729d4df2116d8f000b30d44cf499e5edd27376 100644 (file)
--- a/bootparams/bpwhoami.tproj/bpwhoami.c
+++ b/bootparams/bpwhoami.tproj/bpwhoami.c
@@ -3,21 +3,20 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * "Portions Copyright (c) 1999 Apple Computer, Inc.  All Rights
- * Reserved.  This file contains Original Code and/or Modifications of
- * Original Code as defined in and that are subject to the Apple Public
- * Source License Version 1.0 (the 'License').  You may not use this file
- * except in compliance with the License.  Please obtain a copy of the
- * License at http://www.apple.com/publicsource and read it before using
- * this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License."
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -66,6 +65,7 @@ void usage __P((void));
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <net/if.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <net/if.h>

+#include <ifaddrs.h>

 #include <rpc/rpc.h>
 #include <arpa/inet.h>
 #include "bootparam_prot.h"
 #include <rpc/rpc.h>
 #include <arpa/inet.h>
 #include "bootparam_prot.h"


@@ -122,77 +122,31 @@ each_whoresult(result, from)
        return(FALSE);
 }
 
        return(FALSE);
 }
 

-#define MAX_IF         16

 
 static boolean_t
 
 static boolean_t

-getFirstInterface(struct ifreq * ret_p)
+getFirstInterface(struct sockaddr_in *ret_p)

 {
 {

-    struct ifconf      ifconf; /* points to ifreq */
-    struct ifreq  *    ifreq = NULL;
-    struct ifreq *     ifrp;
-    int                        size = sizeof(struct ifreq) * MAX_IF;
-    int                        sockfd;
-
-    if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-       fprintf(stderr, "bpwhoami: socket call failed\n");
-       return (FALSE);
-    }
-
-    while (1) {
-       if (ifreq != NULL)
-           ifreq = (struct ifreq *)realloc(ifreq, size);
-       else
-           ifreq = (struct ifreq *)malloc(size);
-
-       if (ifreq == NULL)
-           goto err;
-
-       ifconf.ifc_len = size;
-       ifconf.ifc_req = ifreq;
-       if (ioctl(sockfd, SIOCGIFCONF, (caddr_t)&ifconf) < 0
-           || ifconf.ifc_len <= 0) {
-           fprintf(stderr, "bpwhoami: ioctl SIOCGIFCONF failed\n");
-           goto err;
-       }
-       if ((ifconf.ifc_len + sizeof(struct ifreq)) < size)
-           break;
-       size *= 2;
+    struct ifaddrs *ifap;
+    struct ifaddrs *ifcurrent;
+    getifaddrs(&ifap);
+
+    for (ifcurrent = ifap; ifcurrent; ifcurrent = ifcurrent->ifa_next) {
+        if (ifcurrent->ifa_addr->sa_family == AF_INET) {
+            if ((ifcurrent->ifa_flags & IFF_LOOPBACK)
+                     || !(ifcurrent->ifa_flags & IFF_UP))
+                continue;
+            net_mask = ((struct sockaddr_in*)(ifcurrent->ifa_netmask))->sin_addr;
+            *ret_p = *((struct sockaddr_in*)(ifcurrent->ifa_addr));
+            freeifaddrs(ifap);
+            return (TRUE);
+        }

     }
     }

-#define IFR_NEXT(ifr)  \
-    ((struct ifreq *) ((char *) (ifr) + sizeof(*(ifr)) + \
-                      MAX(0, (int) (ifr)->ifr_addr.sa_len \
-                          - (int) sizeof((ifr)->ifr_addr))))
-    for (ifrp = (struct ifreq *) ifconf.ifc_buf;
-        (char *) ifrp < &ifconf.ifc_buf[ifconf.ifc_len];
-        ifrp = IFR_NEXT(ifrp)) {
-       if (ifrp->ifr_addr.sa_family == AF_INET) {
-           struct ifreq        ifr;
-
-           strncpy(ifr.ifr_name, ifrp->ifr_name, sizeof(ifr.ifr_name));
-           if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t)&ifr) < 0)
-               ;
-           else if ((ifr.ifr_flags & IFF_LOOPBACK)
-                    || !(ifr.ifr_flags & IFF_UP))
-               ;
-           else if (ioctl(sockfd, SIOCGIFNETMASK, (caddr_t)&ifr) < 0) 
-               ;
-           else {
-               net_mask = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr;
-               *ret_p = *ifrp;
-               close(sockfd);
-               if (ifreq)
-                   free(ifreq);
-               return (TRUE);
-           }
-       }
-    }
-  err:
-    close(sockfd);
-    if (ifreq)
-       free(ifreq);
+    if (ifap)
+        freeifaddrs(ifap);

     return (FALSE);
 }
 
     return (FALSE);
 }
 

+

 /*
  * Routine: bp_whoami
  * Function:
 /*
  * Routine: bp_whoami
  * Function:


@@ -203,19 +157,17 @@ int
 bp_whoami()
 {
        extern enum clnt_stat   clnt_broadcast();
 bp_whoami()
 {
        extern enum clnt_stat   clnt_broadcast();

-       struct ifreq            ifr;
-       struct sockaddr_in      *sockin;
+       struct sockaddr_in      sockin;

        enum clnt_stat          stat;
        struct bp_whoami_arg    who_arg;
        struct bp_whoami_res    who_res;
 
        enum clnt_stat          stat;
        struct bp_whoami_arg    who_arg;
        struct bp_whoami_res    who_res;
 

-       if (getFirstInterface(&ifr) == FALSE)
+        if (getFirstInterface(&sockin) == FALSE)

            return (2);
 
            return (2);
 

-       sockin = (struct sockaddr_in *) &ifr.ifr_addr;
-       ip_address = sockin->sin_addr;
+       ip_address = sockin.sin_addr;

        who_arg.client_address.bp_address_u.ip_addr =
        who_arg.client_address.bp_address_u.ip_addr =

-           *((ip_addr_t *)&sockin->sin_addr);
+           *((ip_addr_t *)&sockin.sin_addr);

        who_arg.client_address.address_type = IP_ADDR_TYPE;
        bzero(&who_res, sizeof (who_res));
 
        who_arg.client_address.address_type = IP_ADDR_TYPE;
        bzero(&who_res, sizeof (who_res));