firewall3: add UBUS support for redirect sections

[project/firewall3.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 9e034c8..f353d01 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *

- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>

  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -259,9 +259,9 @@ fw3_ubus_rules(struct blob_buf *b)
                        if (!strcmp(blobmsg_name(cur), "l3_device"))
                                l3_device = blobmsg_get_string(cur);
                        else if (!strcmp(blobmsg_name(cur), "interface"))
                        if (!strcmp(blobmsg_name(cur), "l3_device"))
                                l3_device = blobmsg_get_string(cur);
                        else if (!strcmp(blobmsg_name(cur), "interface"))

-                               iface_proto = blobmsg_get_string(cur);
-                       else if (!strcmp(blobmsg_name(cur), "proto"))

                                iface_name = blobmsg_get_string(cur);
                                iface_name = blobmsg_get_string(cur);

+                       else if (!strcmp(blobmsg_name(cur), "proto"))
+                               iface_proto = blobmsg_get_string(cur);

                        else if (!strcmp(blobmsg_name(cur), "data"))
                                data = cur;
                }
                        else if (!strcmp(blobmsg_name(cur), "data"))
                                data = cur;
                }