configd-963.260.1.tar.gz

diff --git a/Plugins/KernelEventMonitor/ev_dlil.c b/Plugins/KernelEventMonitor/ev_dlil.c
index dd45883dca31a7d32f06d566dcfce6e17e584557..c1b136b886a822a18cc97b411e2bb2abe3eaf2e3 100644 (file)
--- a/Plugins/KernelEventMonitor/ev_dlil.c
+++ b/Plugins/KernelEventMonitor/ev_dlil.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018 Apple Inc. All rights reserved.
+ * Copyright (c) 2002-2019 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -388,7 +388,7 @@ S_link_update_status(const char *if_name, CFStringRef interface, boolean_t attac
        bzero((char *)&ifm, sizeof(ifm));
        (void) strlcpy(ifm.ifm_name, if_name, sizeof(ifm.ifm_name));
 
-       if (ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifm) == -1) {
+       if (ioctl(sock, SIOCGIFXMEDIA, (caddr_t)&ifm) == -1) {
                /* if media status not available for this interface */
                goto update;
        }

diff --git a/Plugins/LinkConfiguration/linkconfig.c b/Plugins/LinkConfiguration/linkconfig.c
index 16fe3c4d7915bcc865415486845d6e764b94470b..5ce1cf61d7a9c72409947ddc451c5e9360ac5fdf 100644 (file)
--- a/Plugins/LinkConfiguration/linkconfig.c
+++ b/Plugins/LinkConfiguration/linkconfig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2007, 2011, 2013, 2015-2018 Apple Inc. All rights reserved.
+ * Copyright (c) 2002-2007, 2011, 2013, 2015-2019 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -265,8 +265,8 @@ _SCNetworkInterfaceSetMediaOptions(SCNetworkInterfaceRef    interface,
        bzero((char *)&ifm, sizeof(ifm));
        (void)_SC_cfstring_to_cstring(interfaceName, ifm.ifm_name, sizeof(ifm.ifm_name), kCFStringEncodingASCII);
 
-       if (ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifm) == -1) {
-               SC_log(LOG_ERR, "%@: ioctl(SIOCGIFMEDIA) failed: %s", interfaceName, strerror(errno));
+       if (ioctl(sock, SIOCGIFXMEDIA, (caddr_t)&ifm) == -1) {
+               SC_log(LOG_ERR, "%@: ioctl(SIOCGIFXMEDIA) failed: %s", interfaceName, strerror(errno));
                goto done;
        }
 

diff --git a/SystemConfiguration.fproj/BondConfiguration.c b/SystemConfiguration.fproj/BondConfiguration.c
index f6a566fc210112a4884d6c9b7cdd49a82cc35210..3135897f030b1141165bc05941e4efe2a3f3cee7 100644 (file)
--- a/SystemConfiguration.fproj/BondConfiguration.c
+++ b/SystemConfiguration.fproj/BondConfiguration.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2018 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2019 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -71,7 +71,7 @@ inet_dgram_socket()
 }
 
 static int
-siocgifmedia(int s, const char * ifname, int * status, int * active)
+siocgifxmedia(int s, const char * ifname, int * status, int * active)
 {
        struct ifmediareq       ifmr;
 
@@ -79,7 +79,7 @@ siocgifmedia(int s, const char * ifname, int * status, int * active)
        *active = 0;
        bzero(&ifmr, sizeof(ifmr));
        strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name));
-       if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1) {
+       if (ioctl(s, SIOCGIFXMEDIA, &ifmr) == -1) {
                return (-1);
        }
        if (ifmr.ifm_count != 0) {
@@ -1253,14 +1253,14 @@ SCBondInterfaceCopyStatus(SCBondInterfaceRef bond)
                                if_name,
                                sizeof(if_name),
                                kCFStringEncodingASCII);
-       if (siocgifmedia(s, if_name, &bond_if_status, &bond_if_active) == -1) {
+       if (siocgifxmedia(s, if_name, &bond_if_status, &bond_if_active) == -1) {
                _SCErrorSet(errno);
                switch (errno) {
                        case EBUSY :
                        case ENXIO :
                                break;
                        default :
-                               SC_log(LOG_NOTICE, "siocgifmedia(%s) failed: %s",
+                               SC_log(LOG_NOTICE, "siocgifxmedia(%s) failed: %s",
                                       if_name,
                                       strerror(errno));
                }
@@ -1314,13 +1314,13 @@ SCBondInterfaceCopyStatus(SCBondInterfaceRef bond)
                        int                     status = 0;
                        static lacp_system      zeroes = { {0, 0, 0, 0, 0, 0}};
 
-                       if (siocgifmedia(s, scan_p->ibs_if_name, &status, &active) == -1) {
+                       if (siocgifxmedia(s, scan_p->ibs_if_name, &status, &active) == -1) {
                                switch (errno) {
                                        case EBUSY :
                                        case ENXIO :
                                                break;
                                        default :
-                                               SC_log(LOG_NOTICE, "siocgifmedia(%s) failed: %s",
+                                               SC_log(LOG_NOTICE, "siocgifxmedia(%s) failed: %s",
                                                       if_name,
                                                       strerror(errno));
                                                break;

diff --git a/SystemConfiguration.fproj/LinkConfiguration.c b/SystemConfiguration.fproj/LinkConfiguration.c
index 0f17586a98a0dd89d7629120f416c63597b8036e..6d5335e73ed7743587cd299ada5b0d81495a1523 100644 (file)
--- a/SystemConfiguration.fproj/LinkConfiguration.c
+++ b/SystemConfiguration.fproj/LinkConfiguration.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2007, 2010, 2011, 2013, 2015-2018 Apple Inc. All rights reserved.
+ * Copyright (c) 2002-2007, 2010, 2011, 2013, 2015-2019 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -410,15 +410,15 @@ __copyMediaList(CFStringRef interfaceName)
                goto done;
        }
 
-       if (ioctl(sock, SIOCGIFMEDIA, (caddr_t)ifm) == -1) {
-//             SC_log(LOG_NOTICE, "ioctl(SIOCGIFMEDIA) failed: %s", strerror(errno));
+       if (ioctl(sock, SIOCGIFXMEDIA, (caddr_t)ifm) == -1) {
+//             SC_log(LOG_NOTICE, "ioctl(SIOCGIFXMEDIA) failed: %s", strerror(errno));
                goto done;
        }
 
        if (ifm->ifm_count > 0) {
                ifm->ifm_ulist = (int *)CFAllocatorAllocate(NULL, ifm->ifm_count * sizeof(int), 0);
-               if (ioctl(sock, SIOCGIFMEDIA, (caddr_t)ifm) == -1) {
-                       SC_log(LOG_NOTICE, "ioctl(SIOCGIFMEDIA) failed: %s", strerror(errno));
+               if (ioctl(sock, SIOCGIFXMEDIA, (caddr_t)ifm) == -1) {
+                       SC_log(LOG_NOTICE, "ioctl(SIOCGIFXMEDIA) failed: %s", strerror(errno));
                        goto done;
                }
        }