Changeset 821

Timestamp:

Dec 1, 2016, 7:22:47 PM (3 years ago)

Author:

amain

Message:

swconfig: update with upstream

Location:

trunk/debian/packages/swconfig/trunk

Files:

• README_NEW_UPSTREAM (added)
• debian/changelog (modified) (1 diff)
• debian/patches/002_debwrt_cli.c.patch (modified) (1 diff)
• debian/patches/003_debwrt_swlib.h.patch (modified) (2 diffs)
• debian/patches/007_openwrt_switch.h (modified) (6 diffs)
• debian/rules (modified) (1 diff)
• debian/source/options (added)

trunk/debian/packages/swconfig/trunk/debian/changelog

@@ -2 +2 @@
 
   * Upstream update 11
+  * Use svn-buildpackage
 
- -- Johan van Zoomeren <amain@dev3>  Tue, 29 Nov 2016 22:52:08 +0100
+ -- Johan van Zoomeren <amain@debwrt.net>  Tue, 29 Nov 2016 22:52:08 +0100
 
 swconfig (0.0.10-2~debwrt70+1) wheezy-debwrt-unstable; urgency=medium

trunk/debian/packages/swconfig/trunk/debian/patches/002_debwrt_cli.c.patch

@@ -40 +40 @@
         case CMD_HELP:
                 list_attributes(dev);
-Index: swconfig-0.0.10/src/cli.c.orig
-===================================================================
---- /dev/null
-+++ swconfig-0.0.10/src/cli.c.orig
-@@ -0,0 +1,354 @@
-+/*
-+ * swconfig.c: Switch configuration utility
-+ *
-+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
-+ * Copyright (C) 2010 Martin Mares <mj@ucw.cz>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundatio.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
-+#include <inttypes.h>
-+#include <errno.h>
-+#include <stdint.h>
-+#include <getopt.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <uci.h>
-+
-+#include <linux/types.h>
-+#include <linux/netlink.h>
-+#include <linux/genetlink.h>
-+#include <netlink/netlink.h>
-+#include <netlink/genl/genl.h>
-+#include <netlink/genl/ctrl.h>
-+#include <linux/switch.h>
-+#include "swlib.h"
-+
-+enum {
-+       CMD_NONE,
-+       CMD_GET,
-+       CMD_SET,
-+       CMD_LOAD,
-+       CMD_HELP,
-+       CMD_SHOW,
-+       CMD_PORTMAP,
-+};
-+
-+static void
-+print_attrs(const struct switch_attr *attr)
-+{
-+       int i = 0;
-+       while (attr) {
-+               const char *type;
-+               switch(attr->type) {
-+                       case SWITCH_TYPE_INT:
-+                               type = "int";
-+                               break;
-+                       case SWITCH_TYPE_STRING:
-+                               type = "string";
-+                               break;
-+                       case SWITCH_TYPE_PORTS:
-+                               type = "ports";
-+                               break;
-+                       case SWITCH_TYPE_NOVAL:
-+                               type = "none";
-+                               break;
-+                       default:
-+                               type = "unknown";
-+                               break;
-+               }
-+               printf("\tAttribute %d (%s): %s (%s)\n", ++i, type, attr->name, attr->description);
-+               attr = attr->next;
-+       }
-+}
-+
-+static void
-+list_attributes(struct switch_dev *dev)
-+{
-+       printf("%s: %s(%s), ports: %d (cpu @ %d), vlans: %d\n", dev->dev_name, dev->alias, dev->name, dev->ports, dev->cpu_port, dev->vlans);
-+       printf("     --switch\n");
-+       print_attrs(dev->ops);
-+       printf("     --vlan\n");
-+       print_attrs(dev->vlan_ops);
-+       printf("     --port\n");
-+       print_attrs(dev->port_ops);
-+}
-+
-+static void
-+print_attr_val(const struct switch_attr *attr, const struct switch_val *val)
-+{
-+       int i;
-+
-+       switch (attr->type) {
-+       case SWITCH_TYPE_INT:
-+               printf("%d", val->value.i);
-+               break;
-+       case SWITCH_TYPE_STRING:
-+               printf("%s", val->value.s);
-+               break;
-+       case SWITCH_TYPE_PORTS:
-+               for(i = 0; i < val->len; i++) {
-+                       printf("%d%s ",
-+                               val->value.ports[i].id,
-+                               (val->value.ports[i].flags &
-+                                SWLIB_PORT_FLAG_TAGGED) ? "t" : "");
-+               }
-+               break;
-+       default:
-+               printf("?unknown-type?");
-+       }
-+}
-+
-+static void
-+show_attrs(struct switch_dev *dev, struct switch_attr *attr, struct switch_val *val)
-+{
-+       while (attr) {
-+               if (attr->type != SWITCH_TYPE_NOVAL) {
-+                       printf("\t%s: ", attr->name);
-+                       if (swlib_get_attr(dev, attr, val) < 0)
-+                               printf("???");
-+                       else
-+                               print_attr_val(attr, val);
-+                       putchar('\n');
-+               }
-+               attr = attr->next;
-+       }
-+}
-+
-+static void
-+show_global(struct switch_dev *dev)
-+{
-+       struct switch_val val;
-+
-+       printf("Global attributes:\n");
-+       show_attrs(dev, dev->ops, &val);
-+}
-+
-+static void
-+show_port(struct switch_dev *dev, int port)
-+{
-+       struct switch_val val;
-+
-+       printf("Port %d:\n", port);
-+       val.port_vlan = port;
-+       show_attrs(dev, dev->port_ops, &val);
-+}
-+
-+static void
-+show_vlan(struct switch_dev *dev, int vlan, bool all)
-+{
-+       struct switch_val val;
-+       struct switch_attr *attr;
-+
-+       val.port_vlan = vlan;
-+
-+       if (all) {
-+               attr = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_VLAN, "ports");
-+               if (swlib_get_attr(dev, attr, &val) < 0)
-+                       return;
-+
-+               if (!val.len)
-+                       return;
-+       }
-+
-+       printf("VLAN %d:\n", vlan);
-+       show_attrs(dev, dev->vlan_ops, &val);
-+}
-+
-+static void
-+print_usage(void)
-+{
-+       printf("swconfig list\n");
-+       printf("swconfig dev <dev> [port <port>|vlan <vlan>] (help|set <key> <value>|get <key>|load <config>|show)\n");
-+       exit(1);
-+}
-+
-+static void
-+swconfig_load_uci(struct switch_dev *dev, const char *name)
-+{
-+       struct uci_context *ctx;
-+       struct uci_package *p = NULL;
-+       int ret = -1;
-+
-+       ctx = uci_alloc_context();
-+       if (!ctx)
-+               return;
-+
-+       uci_load(ctx, name, &p);
-+       if (!p) {
-+               uci_perror(ctx, "Failed to load config file: ");
-+               goto out;
-+       }
-+
-+       ret = swlib_apply_from_uci(dev, p);
-+       if (ret < 0)
-+               fprintf(stderr, "Failed to apply configuration for switch '%s'\n", dev->dev_name);
-+
-+out:
-+       uci_free_context(ctx);
-+       exit(ret);
-+}
-+
-+int main(int argc, char **argv)
-+{
-+       int retval = 0;
-+       struct switch_dev *dev;
-+       struct switch_attr *a;
-+       struct switch_val val;
-+       int i;
-+
-+       int cmd = CMD_NONE;
-+       char *cdev = NULL;
-+       int cport = -1;
-+       int cvlan = -1;
-+       char *ckey = NULL;
-+       char *cvalue = NULL;
-+       char *csegment = NULL;
-+
-+       if((argc == 2) && !strcmp(argv[1], "list")) {
-+               swlib_list();
-+               return 0;
-+       }
-+
-+       if(argc < 4)
-+               print_usage();
-+
-+       if(strcmp(argv[1], "dev"))
-+               print_usage();
-+
-+       cdev = argv[2];
-+
-+       for(i = 3; i < argc; i++)
-+       {
-+               char *arg = argv[i];
-+               if (cmd != CMD_NONE) {
-+                       print_usage();
-+               } else if (!strcmp(arg, "port") && i+1 < argc) {
-+                       cport = atoi(argv[++i]);
-+               } else if (!strcmp(arg, "vlan") && i+1 < argc) {
-+                       cvlan = atoi(argv[++i]);
-+               } else if (!strcmp(arg, "help")) {
-+                       cmd = CMD_HELP;
-+               } else if (!strcmp(arg, "set") && i+1 < argc) {
-+                       cmd = CMD_SET;
-+                       ckey = argv[++i];
-+                       if (i+1 < argc)
-+                               cvalue = argv[++i];
-+               } else if (!strcmp(arg, "get") && i+1 < argc) {
-+                       cmd = CMD_GET;
-+                       ckey = argv[++i];
-+               } else if (!strcmp(arg, "load") && i+1 < argc) {
-+                       if ((cport >= 0) || (cvlan >= 0))
-+                               print_usage();
-+                       cmd = CMD_LOAD;
-+                       ckey = argv[++i];
-+               } else if (!strcmp(arg, "portmap")) {
-+                       if (i + 1 < argc)
-+                               csegment = argv[++i];
-+                       cmd = CMD_PORTMAP;
-+               } else if (!strcmp(arg, "show")) {
-+                       cmd = CMD_SHOW;
-+               } else {
-+                       print_usage();
-+               }
-+       }
-+
-+       if (cmd == CMD_NONE)
-+               print_usage();
-+       if (cport > -1 && cvlan > -1)
-+               print_usage();
-+
-+       dev = swlib_connect(cdev);
-+       if (!dev) {
-+               fprintf(stderr, "Failed to connect to the switch. Use the \"list\" command to see which switches are available.\n");
-+               return 1;
-+       }
-+
-+       swlib_scan(dev);
-+
-+       if (cmd == CMD_GET || cmd == CMD_SET) {
-+               if(cport > -1)
-+                       a = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_PORT, ckey);
-+               else if(cvlan > -1)
-+                       a = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_VLAN, ckey);
-+               else
-+                       a = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_GLOBAL, ckey);
-+
-+               if(!a)
-+               {
-+                       fprintf(stderr, "Unknown attribute \"%s\"\n", ckey);
-+                       retval = -1;
-+                       goto out;
-+               }
-+       }
-+
-+       switch(cmd)
-+       {
-+       case CMD_SET:
-+               if ((a->type != SWITCH_TYPE_NOVAL) &&
-+                               (cvalue == NULL))
-+                       print_usage();
-+
-+               if(cvlan > -1)
-+                       cport = cvlan;
-+
-+               if(swlib_set_attr_string(dev, a, cport, cvalue) < 0)
-+               {
-+                       fprintf(stderr, "failed\n");
-+                       retval = -1;
-+                       goto out;
-+               }
-+               break;
-+       case CMD_GET:
-+               if(cvlan > -1)
-+                       val.port_vlan = cvlan;
-+               if(cport > -1)
-+                       val.port_vlan = cport;
-+               if(swlib_get_attr(dev, a, &val) < 0)
-+               {
-+                       fprintf(stderr, "failed\n");
-+                       retval = -1;
-+                       goto out;
-+               }
-+               print_attr_val(a, &val);
-+               putchar('\n');
-+               break;
-+       case CMD_LOAD:
-+               swconfig_load_uci(dev, ckey);
-+               break;
-+       case CMD_HELP:
-+               list_attributes(dev);
-+               break;
-+       case CMD_PORTMAP:
-+               swlib_print_portmap(dev, csegment);
-+               break;
-+       case CMD_SHOW:
-+               if (cport >= 0 || cvlan >= 0) {
-+                       if (cport >= 0)
-+                               show_port(dev, cport);
-+                       else
-+                               show_vlan(dev, cvlan, false);
-+               } else {
-+                       show_global(dev);
-+                       for (i=0; i < dev->ports; i++)
-+                               show_port(dev, i);
-+                       for (i=0; i < dev->vlans; i++)
-+                               show_vlan(dev, i, true);
-+               }
-+               break;
-+       }
-+
-+out:
-+       swlib_free_all(dev);
-+       return retval;
-+}

trunk/debian/packages/swconfig/trunk/debian/patches/003_debwrt_swlib.h.patch

@@ -5 +5 @@
 --- swconfig-0.0.11.orig/src/swlib.h
 +++ swconfig-0.0.11/src/swlib.h
-@@ -111,7 +111,7 @@ struct switch_attr;
- struct switch_port;
+@@ -116,7 +116,7 @@ struct switch_port;
  struct switch_port_map;
+ struct switch_port_link;
  struct switch_val;
 -struct uci_package;
@@ -14 +14 @@
  struct switch_dev {
         int id;
-@@ -247,6 +247,6 @@ int swlib_get_attr(struct switch_dev *de
+@@ -264,6 +264,6 @@ int swlib_get_attr(struct switch_dev *de
   * @dev: switch device struct
   * @p: uci package which contains the desired global config

trunk/debian/packages/swconfig/trunk/debian/patches/007_openwrt_switch.h

@@ -1 @@
-Description: Include OpenWrt's switch.h kernel API
-Author: Johan van Zoomeren <amain@debwrt.net>
-
---- /dev/null
-+++ swconfig-47459/include/linux/switch.h
-@@ -0,0 +1,101 @@
+--- /dev/null   2016-11-27 09:28:40.775309416 +0100
++++ trunk/include/uapi/linux/switch.h   2016-12-01 18:58:45.203309416 +0100
+@@ -0,0 +1,119 @@
 +/*
 + * switch.h: Switch configuration API
 + *
-+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
 + *
 + * This program is free software; you can redistribute it and/or
@@ -21 +18 @@
 + */
 +
-+#ifndef _LINUX_SWITCH_H
-+#define _LINUX_SWITCH_H
++#ifndef _UAPI_LINUX_SWITCH_H
++#define _UAPI_LINUX_SWITCH_H
 +
 +#include <linux/types.h>
@@ -28 +25 @@
 +#include <linux/netlink.h>
 +#include <linux/genetlink.h>
++#ifndef __KERNEL__
 +#include <netlink/netlink.h>
 +#include <netlink/genl/genl.h>
 +#include <netlink/genl/ctrl.h>
++#endif
 +
 +/* main attributes */
@@ -55 +54 @@
 +       SWITCH_ATTR_OP_VALUE_STR,
 +       SWITCH_ATTR_OP_VALUE_PORTS,
++       SWITCH_ATTR_OP_VALUE_LINK,
 +       SWITCH_ATTR_OP_DESCRIPTION,
 +       /* port lists */
@@ -91 +91 @@
 +       SWITCH_TYPE_STRING,
 +       SWITCH_TYPE_PORTS,
++       SWITCH_TYPE_LINK,
 +       SWITCH_TYPE_NOVAL,
 +};
@@ -102 +103 @@
 +};
 +
++/* link nested attributes */
++enum {
++       SWITCH_LINK_UNSPEC,
++       SWITCH_LINK_FLAG_LINK,
++       SWITCH_LINK_FLAG_DUPLEX,
++       SWITCH_LINK_FLAG_ANEG,
++       SWITCH_LINK_FLAG_TX_FLOW,
++       SWITCH_LINK_FLAG_RX_FLOW,
++       SWITCH_LINK_SPEED,
++       SWITCH_LINK_FLAG_EEE_100BASET,
++       SWITCH_LINK_FLAG_EEE_1000BASET,
++       SWITCH_LINK_ATTR_MAX,
++};
++
 +#define SWITCH_ATTR_DEFAULTS_OFFSET    0x1000
 +
 +
-+#endif /* _LINUX_SWITCH_H */
++#endif /* _UAPI_LINUX_SWITCH_H */

trunk/debian/packages/swconfig/trunk/debian/rules

@@ -12 +12 @@
 
 # ../include contains switch.sh kernel API (see patch 007)
-CFLAGS+=-O2 -g -I ../include -I /usr/include/netlink-tiny
+CFLAGS+=-O2 -g -I ../include/uapi -I /usr/include/netlink-tiny
 
 %: