Changeset 988 for vendor/current/source3/lib/interface.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/lib/interface.c (modified) (11 diffs)

vendor/current/source3/lib/interface.c

@@ -20 +20 @@
 
 #include "includes.h"
-#include "interfaces.h"
+#include "lib/socket/interfaces.h"
+#include "librpc/gen_ndr/ioctl.h"
 
 static struct iface_struct *probed_ifaces;
@@ -306 +307 @@
         struct interface *iface;
 
-        if (iface_find((struct sockaddr *)&ifs->ip, False)) {
+        if (iface_find((const struct sockaddr *)&ifs->ip, False)) {
                 DEBUG(3,("add_interface: not adding duplicate interface %s\n",
                         print_sockaddr(addr, sizeof(addr), &ifs->ip) ));
@@ -334 +335 @@
         iface->netmask = ifs->netmask;
         iface->bcast = ifs->bcast;
+        iface->linkspeed = ifs->linkspeed;
+        iface->capability = ifs->capability;
+        iface->if_index = ifs->if_index;
 
         DLIST_ADD(local_interfaces, iface);
@@ -348 +352 @@
 }
 
+
+static void parse_extra_info(char *key, uint64_t *speed, uint32_t *cap,
+                             uint32_t *if_index)
+{
+        while (key != NULL && *key != '\0') {
+                char *next_key;
+                char *val;
+
+                next_key = strchr_m(key, ',');
+                if (next_key != NULL) {
+                        *next_key++ = 0;
+                }
+
+                val = strchr_m(key, '=');
+                if (val != NULL) {
+                        *val++ = 0;
+
+                        if (strequal_m(key, "speed")) {
+                                *speed = (uint64_t)strtoull(val, NULL, 0);
+                        } else if (strequal_m(key, "capability")) {
+                                if (strequal_m(val, "RSS")) {
+                                        *cap |= FSCTL_NET_IFACE_RSS_CAPABLE;
+                                } else if (strequal(val, "RDMA")) {
+                                        *cap |= FSCTL_NET_IFACE_RDMA_CAPABLE;
+                                } else {
+                                        DBG_WARNING("Capability unknown: "
+                                                    "'%s'\n", val);
+                                }
+                        } else if (strequal_m(key, "if_index")) {
+                                *if_index = (uint32_t)strtoul(val, NULL, 0);
+                        } else {
+                                DBG_DEBUG("Key unknown: '%s'\n", key);
+                        }
+                }
+
+                key = next_key;
+        }
+}
+
 /****************************************************************************
  Interpret a single element from a interfaces= config line.
@@ -358 +401 @@
  4) ip/mask
  5) bcast/mask
+
+ Additional information for an interface can be specified with
+ this extended syntax:
+
+    interface[;key1=value1[,key2=value2[...]]]
+
+ where
+ - keys known: 'speed', 'capability', 'if_index'
+ - speed is in bits per second
+ - capabilites known: 'RSS', 'RDMA'
+ - if_index should be used with care, because
+   these indexes should not conicide with indexes
+   the kernel sets...
+
 ****************************************************************************/
 
@@ -371 +428 @@
         bool added=false;
         bool goodaddr = false;
+        uint64_t speed = 0;
+        uint32_t cap = FSCTL_NET_IFACE_NONE_CAPABLE;
+        uint32_t if_index = 0;
+        bool speed_set = false;
+        bool cap_set = false;
+        bool if_index_set = false;
 
         /* first check if it is an interface name */
@@ -383 +446 @@
         }
 
-        /* maybe it is a DNS name */
+        /*
+         * extract speed / capability information if present
+         */
+        p = strchr_m(token, ';');
+        if (p != NULL) {
+                *p++ = 0;
+                parse_extra_info(p, &speed, &cap, &if_index);
+                if (speed != 0) {
+                        speed_set = true;
+                }
+                if (cap != FSCTL_NET_IFACE_NONE_CAPABLE) {
+                        cap_set = true;
+                }
+                if (if_index != 0) {
+                        if_index_set = true;
+                }
+        }
+
         p = strchr_m(token,'/');
         if (p == NULL) {
@@ -393 +473 @@
 
                 for (i=0;i<total_probed;i++) {
-                        if (sockaddr_equal((struct sockaddr *)&ss, (struct sockaddr *)&probed_ifaces[i].ip)) {
+                        if (sockaddr_equal((struct sockaddr *)&ss,
+                                (struct sockaddr *)&probed_ifaces[i].ip))
+                        {
+                                if (speed_set) {
+                                        probed_ifaces[i].linkspeed = speed;
+                                }
+                                if (cap_set) {
+                                        probed_ifaces[i].capability = cap;
+                                }
+                                if (if_index_set) {
+                                        probed_ifaces[i].if_index = if_index;
+                                }
                                 add_interface(&probed_ifaces[i]);
                                 return;
@@ -463 +554 @@
                                         p,
                                         probed_ifaces[i].name));
+                                if (speed_set) {
+                                        probed_ifaces[i].linkspeed = speed;
+                                }
+                                if (cap_set) {
+                                        probed_ifaces[i].capability = cap;
+                                }
+                                if (if_index_set) {
+                                        probed_ifaces[i].if_index = if_index;
+                                }
                                 add_interface(&probed_ifaces[i]);
                                 probed_ifaces[i].netmask = saved_mask;
@@ -485 +585 @@
         ifs.netmask = ss_mask;
         ifs.bcast = ss_bcast;
+        if (if_index_set) {
+                probed_ifaces[i].if_index = if_index;
+        }
+        if (speed_set) {
+                ifs.linkspeed = speed;
+        } else {
+                ifs.linkspeed = 1000 * 1000 * 1000;
+        }
+        ifs.capability = cap;
         add_interface(&ifs);
 }
@@ -504 +613 @@
 
         if (total_probed > 0) {
-                probed_ifaces = (struct iface_struct *)memdup(ifaces,
+                probed_ifaces = (struct iface_struct *)smb_memdup(ifaces,
                                 sizeof(ifaces[0])*total_probed);
                 if (!probed_ifaces) {
-                        DEBUG(0,("ERROR: memdup failed\n"));
+                        DEBUG(0,("ERROR: smb_memdup failed\n"));
                         exit(1);
                 }