Changeset 10889

Timestamp:

11/13/08 00:11:31 (5 years ago)

Author:

BrainSlayer

Message:

new bonding driver (implementation)

Location:

src/router

Files:

• httpd/visuals/dd-wrt.c (modified) (1 diff)
• ifenslave/ifenslave.c (modified) (10 diffs)
• services/services/bonding.c (modified) (1 diff)

src/router/httpd/visuals/dd-wrt.c

@@ -2097 +2097 @@
     websWrite( wp, "<div class=\"label\">Bonding Type</div>\n", count );
     showOptions( wp, "bonding_type",
-                 "balance-rr active-backup balance-xor broadcast 802.3ad balance-tlb balance-alb",
+                 "balance-rr active-backup balance-xor broadcast 802.3ad balance-tlb balance-alb weighted-rr duplex",
                  nvram_default_get( "bonding_type", "balance-rr" ) );
     websWrite( wp, "&nbsp;Bonding Interfaces&nbsp;" );

src/router/ifenslave/ifenslave.c

@@ -110 +110 @@
 "       ifenslave -d   <master-if> <slave-if> [<slave-if>...]\n"
 "       ifenslave -c   <master-if> <slave-if>\n"
+"       ifenslave -w   <master-if> <slave-if> <weight>\n"
 "       ifenslave --help\n";
 
@@ -140 +141 @@
 "       # ifenslave {-a|--all-interfaces}\n"
 "\n"
+"       To change iface weight to 3\n"
+"       # ifenslave -w bond0 eth0 3\n"
+"\n"
 "       To be more verbose\n"
 "       # ifenslave {-v|--verbose} ...\n"
@@ -176 +180 @@
         {"change-active",       0, 0, 'c'},     /* Change the active slave.  */
         {"detach",              0, 0, 'd'},     /* Detach a slave interface. */
+        {"weight",              0, 0, 'w'},     /* Detach a slave interface. */
         {"force",               0, 0, 'f'},     /* Force the operation. */
         {"help",                0, 0, 'h'},     /* Give help */
@@ -192 +197 @@
 opt_h = 0,      /* Help */
 opt_u = 0,      /* Usage */
+opt_w = 0,      /* Weight */
 opt_v = 0,      /* Verbose flag. */
 opt_V = 0;      /* Version */
@@ -199 +205 @@
 int hwaddr_set = 0;     /* Master's hwaddr is set */
 int saved_errno;
+int weight;
 
 struct ifreq master_mtu, master_flags, master_hwaddr;
@@ -229 +236 @@
 static int set_master_hwaddr(char *master_ifname, struct sockaddr *hwaddr);
 static int set_slave_hwaddr(char *slave_ifname, struct sockaddr *hwaddr);
+static int set_slave_weight(char *master_ifname, char* slave_ifname,
+                int weight);
 static int set_slave_mtu(char *slave_ifname, int mtu);
 static int set_if_flags(char *ifname, short flags);
@@ -249 +258 @@
         int exclusive = 0;
 
-        while ((c = getopt_long(argc, argv, "acdfhuvV", longopts, 0)) != EOF) {
+        while ((c = getopt_long(argc, argv, "acdfhuwvV", longopts, 0)) != EOF) {
                 switch (c) {
                 case 'a': opt_a++; exclusive++; break;
@@ -257 +266 @@
                 case 'h': opt_h++; exclusive++; break;
                 case 'u': opt_u++; exclusive++; break;
+                case 'w': opt_w++; ; break;
                 case 'v': opt_v++; break;
                 case 'V': opt_V++; exclusive++; break;
@@ -422 +432 @@
                                 master_family);
                 }
+        }
+        
+        if (opt_w) {
+                if (*spp == NULL) {
+                        fprintf(stderr, usage_msg);
+                        res = 2;
+                        goto out;
+                }
+                weight = strtol(*spp++, 0, 10);
+                if (errno == ERANGE) {
+                        fprintf(stderr, "invalid weight");
+                        res = 2;
+                        goto out;
+                }
+                res = get_slave_flags(slave_ifname);
+                if (res) {
+                        fprintf(stderr,
+                                "Slave '%s': Error: get flags failed. "
+                                "Aborting\n",
+                                slave_ifname);
+                        goto out;
+                }
+                res = set_slave_weight(master_ifname, slave_ifname, weight);
+                if (res) {
+                        fprintf(stderr,
+                                "Master '%s', Slave '%s': Error: "
+                                "Change weight failed\n",
+                                master_ifname, slave_ifname);
+                }
+                goto out;
         }
 
@@ -966 +1006 @@
 }
 
+static int set_slave_weight(char *master_ifname, char *slave_ifname, int weight)
+{
+        struct ifreq ifr;
+        int res = 0;
+
+        if (!(slave_flags.ifr_flags & IFF_SLAVE)) {
+                fprintf(stderr,
+                        "Illegal operation: The specified slave interface "
+                        "'%s' is not a slave\n",
+                        slave_ifname);
+                return 1;
+        }
+
+        strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ);
+        strncpy(ifr.ifr_weight_slave, slave_ifname, IFNAMSIZ);
+        ifr.ifr_weight_weight = weight;
+        if (ioctl(skfd, SIOCBONDSETWEIGHT, &ifr) < 0) {
+                saved_errno = errno;
+                v_print("Master '%s': Error: SIOCBONDSETWEIGHT failed: "
+                        "%s\n",
+                        master_ifname, strerror(saved_errno));
+                res = 1;
+        }
+
+        return res;
+}
+
 static int set_slave_mtu(char *slave_ifname, int mtu)
 {

src/router/services/services/bonding.c

@@ -36 +36 @@
     sprintf( count, "max_bonds=%s",
              nvram_default_get( "bonding_number", "1" ) );
-    eval( "insmod", "bonding", "miimon=100", mode, count );
+    eval( "insmod", "bonding", "miimon=100","downdelay=200","updelay=200", mode, count );
 
     static char word[256];