s4:kdc: Implement KDC plugin hardware authentication policy

[samba.git] / lib / socket / interfaces.c

diff --git a/lib/socket/interfaces.c b/lib/socket/interfaces.c
index ac26b97c248d8eb4e60e2e81edae140e278c13ee..2426ce2b52a3d3fd75b89d4296a0c5c2284e86dd 100644 (file)
--- a/lib/socket/interfaces.c
+++ b/lib/socket/interfaces.c
@@ -73,7 +73,7 @@ bool make_netmask(struct sockaddr_storage *pss_out,
 }
 
 /****************************************************************************
- Create a struct sockaddr_storage set to the broadcast or network adress from
+ Create a struct sockaddr_storage set to the broadcast or network address from
  an incoming sockaddr_storage.
 ****************************************************************************/
 
@@ -136,12 +136,12 @@ static void query_iface_speed_from_name(const char *name, uint64_t *speed)
 
        fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
        if (fd == -1) {
-               DBG_ERR("Failed to open socket.");
+               DBG_ERR("Failed to open socket.\n");
                return;
        }
 
        if (strlen(name) >= IF_NAMESIZE) {
-               DBG_ERR("Interface name too long.");
+               DBG_ERR("Interface name too long.\n");
                goto done;
        }
 
@@ -149,6 +149,7 @@ static void query_iface_speed_from_name(const char *name, uint64_t *speed)
        strlcpy(ifr.ifr_name, name, IF_NAMESIZE);
 
        ifr.ifr_data = (void *)&edata;
+       ZERO_STRUCT(edata);
        edata.cmd = ETHTOOL_GLINK;
        ret = ioctl(fd, SIOCETHTOOL, &ifr);
        if (ret == -1) {
@@ -161,6 +162,7 @@ static void query_iface_speed_from_name(const char *name, uint64_t *speed)
        }
 
        ifr.ifr_data = (void *)&ecmd;
+       ZERO_STRUCT(ecmd);
        ecmd.cmd = ETHTOOL_GSET;
        ret = ioctl(fd, SIOCETHTOOL, &ifr);
        if (ret == -1) {
@@ -168,6 +170,42 @@ static void query_iface_speed_from_name(const char *name, uint64_t *speed)
        }
        *speed = ((uint64_t)ethtool_cmd_speed(&ecmd)) * 1000 * 1000;
 
+done:
+       (void)close(fd);
+}
+
+static void query_iface_rx_queues_from_name(const char *name,
+                                           uint64_t *rx_queues)
+{
+       int ret = 0;
+       struct ethtool_rxnfc rxcmd;
+       struct ifreq ifr;
+       int fd;
+
+       fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
+       if (fd == -1) {
+               DBG_ERR("Failed to open socket.\n");
+               return;
+       }
+
+       if (strlen(name) >= IF_NAMESIZE) {
+               DBG_ERR("Interface name too long.\n");
+               goto done;
+       }
+
+       ZERO_STRUCT(ifr);
+       strlcpy(ifr.ifr_name, name, IF_NAMESIZE);
+
+       ifr.ifr_data = (void *)&rxcmd;
+       ZERO_STRUCT(rxcmd);
+       rxcmd.cmd = ETHTOOL_GRXRINGS;
+       ret = ioctl(fd, SIOCETHTOOL, &ifr);
+       if (ret == -1) {
+               goto done;
+       }
+
+       *rx_queues = rxcmd.data;
+
 done:
        (void)close(fd);
 }
@@ -215,6 +253,7 @@ static int _get_interfaces(TALLOC_CTX *mem_ctx, struct iface_struct **pifaces)
        /* Loop through interfaces, looking for given IP address */
        for (ifptr = iflist; ifptr != NULL; ifptr = ifptr->ifa_next) {
                uint64_t if_speed = 1000 * 1000 * 1000; /* 1Gbps */
+               uint64_t rx_queues = 1;
 
                if (!ifptr->ifa_addr || !ifptr->ifa_netmask) {
                        continue;
@@ -276,9 +315,13 @@ static int _get_interfaces(TALLOC_CTX *mem_ctx, struct iface_struct **pifaces)
 
 #ifdef HAVE_ETHTOOL
                query_iface_speed_from_name(ifptr->ifa_name, &if_speed);
+               query_iface_rx_queues_from_name(ifptr->ifa_name, &rx_queues);
 #endif
                ifaces[total].linkspeed = if_speed;
                ifaces[total].capability = FSCTL_NET_IFACE_NONE_CAPABLE;
+               if (rx_queues > 1) {
+                       ifaces[total].capability |= FSCTL_NET_IFACE_RSS_CAPABLE;
+               }
 
                if (strlcpy(ifaces[total].name, ifptr->ifa_name,
                        sizeof(ifaces[total].name)) >=
@@ -343,18 +386,18 @@ static int iface_comp(struct iface_struct *i1, struct iface_struct *i2)
        if (((struct sockaddr *)&i1->ip)->sa_family == AF_INET) {
                struct sockaddr_in *s1 = (struct sockaddr_in *)&i1->ip;
                struct sockaddr_in *s2 = (struct sockaddr_in *)&i2->ip;
-
-               r = ntohl(s1->sin_addr.s_addr) -
-                       ntohl(s2->sin_addr.s_addr);
-               if (r) {
-                       return r;
+               uint32_t a1 = ntohl(s1->sin_addr.s_addr);
+               uint32_t a2 = ntohl(s2->sin_addr.s_addr);
+               r = NUMERIC_CMP(a1, a2);
+               if (r == 0) {
+                       /* compare netmasks as a tiebreaker */
+                       s1 = (struct sockaddr_in *)&i1->netmask;
+                       s2 = (struct sockaddr_in *)&i2->netmask;
+                       a1 = ntohl(s1->sin_addr.s_addr);
+                       a2 = ntohl(s2->sin_addr.s_addr);
+                       r = NUMERIC_CMP(a1, a2);
                }
-
-               s1 = (struct sockaddr_in *)&i1->netmask;
-               s2 = (struct sockaddr_in *)&i2->netmask;
-
-               return ntohl(s1->sin_addr.s_addr) -
-                       ntohl(s2->sin_addr.s_addr);
+               return r;
        }
        return 0;
 }