From 542db8a71d9fbf4842a9909a8ce7cc7b1f9fd275 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Thu, 11 Jul 2019 11:06:43 +0200 Subject: [PATCH] luci-app-bmx7: transfer to luci.git The package was recently[0] moved to luci.git [0]: https://github.com/openwrt/luci/commit/9aa507790e8a75ab8f52e267e29059a080d55122 Signed-off-by: Paul Spooren --- luci-app-bmx7/COPYING | 339 ----------- luci-app-bmx7/Makefile | 63 -- luci-app-bmx7/files/etc/config/luci-bmx7 | 7 - .../usr/lib/lua/luci/controller/bmx7.lua | 101 ---- .../view/admin_status/index/bmx7_nodes.htm | 40 -- .../usr/lib/lua/luci/view/bmx7/nodes_j.htm | 155 ----- .../usr/lib/lua/luci/view/bmx7/status_j.htm | 130 ---- .../usr/lib/lua/luci/view/bmx7/topology.htm | 54 -- .../usr/lib/lua/luci/view/bmx7/tunnels_j.htm | 76 --- luci-app-bmx7/files/www/cgi-bin/bmx7-info | 133 ---- .../luci-static/resources/bmx7/bmx7logo.png | Bin 5121 -> 0 bytes .../resources/bmx7/css/netjsongraph-theme.css | 59 -- .../resources/bmx7/css/netjsongraph.css | 62 -- .../resources/bmx7/js/netjsongraph.js | 568 ------------------ .../luci-static/resources/bmx7/js/polling.js | 86 --- .../www/luci-static/resources/bmx7/world.png | Bin 1885 -> 0 bytes .../resources/bmx7/world_small.png | Bin 923 -> 0 bytes 17 files changed, 1873 deletions(-) delete mode 100644 luci-app-bmx7/COPYING delete mode 100644 luci-app-bmx7/Makefile delete mode 100644 luci-app-bmx7/files/etc/config/luci-bmx7 delete mode 100644 luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua delete mode 100644 luci-app-bmx7/files/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm delete mode 100644 luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/nodes_j.htm delete mode 100644 luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/status_j.htm delete mode 100644 luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/topology.htm delete mode 100644 luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/tunnels_j.htm delete mode 100755 luci-app-bmx7/files/www/cgi-bin/bmx7-info delete mode 100644 luci-app-bmx7/files/www/luci-static/resources/bmx7/bmx7logo.png delete mode 100644 luci-app-bmx7/files/www/luci-static/resources/bmx7/css/netjsongraph-theme.css delete mode 100644 luci-app-bmx7/files/www/luci-static/resources/bmx7/css/netjsongraph.css delete mode 100644 luci-app-bmx7/files/www/luci-static/resources/bmx7/js/netjsongraph.js delete mode 100644 luci-app-bmx7/files/www/luci-static/resources/bmx7/js/polling.js delete mode 100644 luci-app-bmx7/files/www/luci-static/resources/bmx7/world.png delete mode 100644 luci-app-bmx7/files/www/luci-static/resources/bmx7/world_small.png diff --git a/luci-app-bmx7/COPYING b/luci-app-bmx7/COPYING deleted file mode 100644 index d511905..0000000 --- a/luci-app-bmx7/COPYING +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/luci-app-bmx7/Makefile b/luci-app-bmx7/Makefile deleted file mode 100644 index dbd71c8..0000000 --- a/luci-app-bmx7/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright © 2011 Pau Escrich -# Contributors Roger Pueyo Centelles -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# 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. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# The full GNU General Public License is included in this distribution in -# the file called "COPYING". - -include $(TOPDIR)/rules.mk - -PKG_NAME:=luci-app-bmx7 -PKG_RELEASE:=0.1-alpha - -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -PKG_LICENSE:=GPL-2.0+ - -include $(INCLUDE_DIR)/package.mk - -define Package/luci-app-bmx7 - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=3. Applications - TITLE:= LuCI support for BMX7 - DEPENDS:=+luci-lib-json +luci-mod-admin-full +bmx7 +bmx7-json - MAINTAINER:= Roger Pueyo and Pau Escrich -endef - -define Package/luci-app-bmx7/description - LuCI application for web-based configuration and visualization of the BMX7 routing daemon -endef - -define Package/luci-app-bmx7/conffiles - /etc/config/luci-bmx7 -endef - -define Build/Prepare -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/luci-app-bmx7/install - $(CP) ./files/* $(1)/ - chmod 755 $(1)/www/cgi-bin/bmx7-info -endef - -$(eval $(call BuildPackage,luci-app-bmx7)) - diff --git a/luci-app-bmx7/files/etc/config/luci-bmx7 b/luci-app-bmx7/files/etc/config/luci-bmx7 deleted file mode 100644 index 46a7727..0000000 --- a/luci-app-bmx7/files/etc/config/luci-bmx7 +++ /dev/null @@ -1,7 +0,0 @@ -config 'bmx7' 'luci' - option ignore '0' - option place 'admin network BMX7' - #option place 'qmp Mesh' - option position '3' - #option json 'http://127.0.0.1/cgi-bin/bmx7-info?' - option json 'exec:/www/cgi-bin/bmx7-info -s' diff --git a/luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua b/luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua deleted file mode 100644 index 482fb5d..0000000 --- a/luci-app-bmx7/files/usr/lib/lua/luci/controller/bmx7.lua +++ /dev/null @@ -1,101 +0,0 @@ ---[[ - Copyright (C) 2011 Pau Escrich - Contributors Jo-Philipp Wich - Roger Pueyo Centelles - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - The full GNU General Public License is included in this distribution in - the file called "COPYING". ---]] - -module("luci.controller.bmx7", package.seeall) - -function index() - local place = {} - local ucim = require "luci.model.uci" - local uci = ucim.cursor() - - -- checking if ignore is on - if uci:get("luci-bmx7","luci","ignore") == "1" then - return nil - end - - -- getting value from uci database - local uci_place = uci:get("luci-bmx7","luci","place") - - -- default values - if uci_place == nil then - place = {"bmx7"} - else - local util = require "luci.util" - place = util.split(uci_place," ") - end - - -- getting position of menu - local uci_position = uci:get("luci-bmx7","luci","position") - - - --------------------------- - -- Placing the pages in the menu - --------------------------- - - -- Status (default) - entry(place,call("action_status_j"),place[#place],tonumber(uci_position)) - - table.insert(place,"Status") - entry(place,call("action_status_j"),"Status",0) - table.remove(place) - - -- Topology - table.insert(place,"Topology") - entry(place,call("topology"),"Topology",1) - table.remove(place) - - -- Nodes - table.insert(place,"Nodes") - entry(place,call("action_nodes_j"),"Nodes",2) - table.remove(place) - - -- Tunnels - table.insert(place,"Gateways") - entry(place,call("action_tunnels_j"),"Gateways",3) - table.remove(place) - - -- Integrate bmx7-mdns if present - if nixio.fs.stat("/usr/lib/lua/luci/model/cbi/bmx7-mdns.lua","type") ~= nil then - table.insert(place,"mDNS") - entry(place, cbi("bmx7-mdns"), "mesh DNS", 1).dependent=false - table.remove(place) - end - -end - - -function action_status_j() - luci.template.render("bmx7/status_j", {}) -end - -function action_tunnels_j() - luci.template.render("bmx7/tunnels_j", {}) -end - -function topology() - luci.template.render("bmx7/topology", {}) -end - -function action_nodes_j() - luci.template.render("bmx7/nodes_j", {}) -end diff --git a/luci-app-bmx7/files/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm b/luci-app-bmx7/files/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm deleted file mode 100644 index 8a6aefa..0000000 --- a/luci-app-bmx7/files/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm +++ /dev/null @@ -1,40 +0,0 @@ -
-
- <%:Bmx7 mesh nodes%> -
-
-
-
<%:Name%>
-
<%:Short ID%>
-
<%:S/s/T/t%>
-
<%:Primary IPv6%>
-
<%:Via Neighbour%>
-
<%:Device%>
-
<%:Metric%>
-
<%:Last Ref%>
-
-
-
-
-
- - - diff --git a/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/nodes_j.htm b/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/nodes_j.htm deleted file mode 100644 index a631c93..0000000 --- a/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/nodes_j.htm +++ /dev/null @@ -1,155 +0,0 @@ -<%# - Copyright © 2011 Pau Escrich - Contributors Lluis Esquerda - Roger Pueyo Centelles - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - The full GNU General Public License is included in this distribution in - the file called "COPYING". --%> - -<%+header%> - - - - - - -
- -

Mesh nodes

-
-
-
-
- Tip: click the icon to see individual node information. -
-
- - -
- <%:Originators%> -
-
-
-
-
<%:Name%>
-
<%:Short ID%>
-
<%:S/s/T/t%>
-
<%:Primary IPv6%>
-
<%:Via Neighbour%>
-
<%:Metric%>
-
<%:Last Desc%>
-
<%:Last Ref%>
-
<%: %>
-
-
-
-
- -
- - - -<%+footer%> diff --git a/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/status_j.htm b/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/status_j.htm deleted file mode 100644 index b7609d7..0000000 --- a/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/status_j.htm +++ /dev/null @@ -1,130 +0,0 @@ -<%+header%> - - - -
-
- -
-
- A mesh routing protocol for Linux devices.
- Visit bmx6.net for more information.
-
-
- -
- -
- <%:Node configuration%> -
-
-
-
<%:Short ID%>
-
<%:Node name%>
-
<%:Primary IPv6 address%>
-
<%:Node key%>
-
<%:Short DHash%>
-
<%:BMX7 revision%>
-
-
-
-
- - -
- <%:Node status%> -
-
-
-
<%:Nodes seen%>
-
<%:Neighbours%>
-
<%:Tunnelled IPv6 address%>
-
<%:Tunnelled IPv4 address%>
-
<%:Uptime%>
-
<%:CPU usage%>
-
<%:Memory usage%>
-
<%:Tx queue%>
-
-
-
-
- -
- <%:Network interfaces%> -
-
-
-
<%:Interface%>
-
<%:State%>
-
<%:Type%>
-
<%:Max rate%>
-
<%:LinkLocal Ipv6%>
-
<%:RX BpP%>
-
<%:TX BpP%>
-
-
-
-
- - -
- <%:Links%> -
- -
-
- -
- - - -<%+footer%> diff --git a/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/topology.htm b/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/topology.htm deleted file mode 100644 index 58ce9fd..0000000 --- a/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/topology.htm +++ /dev/null @@ -1,54 +0,0 @@ -<%+header%> - - - - - - -<%+footer%> - diff --git a/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/tunnels_j.htm b/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/tunnels_j.htm deleted file mode 100644 index aaa79a8..0000000 --- a/luci-app-bmx7/files/usr/lib/lua/luci/view/bmx7/tunnels_j.htm +++ /dev/null @@ -1,76 +0,0 @@ -<%# - Copyright (C) 2011 Pau Escrich - Contributors Lluis Esquerda - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - 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. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - The full GNU General Public License is included in this distribution in - the file called "COPYING". --%> - - -<%+header%> - - - -
-

Gateway announcements

-
Networks announced by mesh nodes
- -
- <%:Announcements%> -
-
-
-
<%:Status%>
-
<%:Name%>
-
<%:Node%>
-
<%:Network%>
-
<%:Bandwith%>
-
<%:Local net%>
-
<%:Path Metric%>
-
<%:Tun Metric%>
-
<%:Rating%>
-
-
-
-
- -
- - - -<%+footer%> diff --git a/luci-app-bmx7/files/www/cgi-bin/bmx7-info b/luci-app-bmx7/files/www/cgi-bin/bmx7-info deleted file mode 100755 index 7388ed1..0000000 --- a/luci-app-bmx7/files/www/cgi-bin/bmx7-info +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/sh -# Copyright © 2011 Pau Escrich -# Contributors Jo-Philipp Wich -# Roger Pueyo Centelles -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# 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. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# The full GNU General Public License is included in this distribution in -# the file called "COPYING". -# -# This script gives information about bmx7 -# Can be executed from a linux shell: ./bmx7-info -s links -# Or from web interfae (with cgi enabled): http://host/cgi-bin/bmx7-info?links -# If you ask for a directory you wil get the directory contents in JSON forman - -BMX7_DIR="$(uci get bmx7.general.runtimeDir 2>/dev/null)" || BMX7_DIR="/var/run/bmx7/json" - -#Checking if shell mode or cgi-bin mode -if [ "$1" == "-s" ]; then - QUERY="$2" -else - QUERY="${QUERY_STRING%%=*}" - echo "Content-type: application/json" - echo "" -fi - -check_path() { - [ -d "$1" ] && path=$(cd $1; pwd) - [ -f "$1" ] && path=$(cd $1/..; pwd) - [ $(echo "$path" | grep -c "^$BMX7_DIR") -ne 1 ] && exit 1 -} - -print_mem() { - echo -n '{ "memory": { "bmx7": "' - cat /proc/$(cat /var/run/bmx7/pid)/status |grep -i VmSize | tr -s " " | cut -d " " -f 2,3 | tr -d "\n" - echo '"}}' -} - -print_query() { - # If the query is a directory - [ -d "$BMX7_DIR/$1" ] && - { - # If /all has not been specified - [ -z "$QALL" ] && - { - total=$(ls $BMX7_DIR/$1 | wc -w) - i=1 - echo -n "{ \"$1\": [ " - for f in $(ls $BMX7_DIR/$1); do - echo -n "{ \"name\": \"$f\" }" - [ $i -lt $total ] && echo -n ',' - i=$(( $i + 1 )) - done - echo -n " ] }" - - # If /all has been specified, printing all the files together - } || { - comma="" - echo -n "[ " - for entry in "$BMX7_DIR/$1/"*; do - [ -f "$entry" ] && - { - ${comma:+echo "$comma"} - tr -d '\n' < "$entry" - comma="," - } - done - echo -n " ]" - } - } - - # If the query is a file, just printing the file - [ -f "$BMX7_DIR/$1" ] && [ -s "$BMX7_DIR/$1" ] && cat "$BMX7_DIR/$1" && return 0 || return 1 -} - -if [ "${QUERY##*/}" == "all" ]; then - QUERY="${QUERY%/all}" - QALL=1 -fi - -if [ "$QUERY" == '$info' ]; then - echo '{ "info": [ ' - print_query status - echo -n "," - print_query interfaces && echo -n "," || echo -n '{ "interfaces": "" },' - print_query links && echo -n "," || echo -n '{ "links": "" },' - print_mem - echo "] }" -fi - -if [ "$QUERY" == '$neighbours' ]; then - QALL=1 - echo '{ "neighbours": [ ' - echo '{ "originators": ' - print_query originators - echo '}, ' - echo '{ "descriptions": ' - print_query descriptions - echo "} ] }" - exit 0 - -else if [ "$QUERY" == '$tunnels' ]; then - bmx7 -c --jshow tunnels /r=0 - exit 0 - - else if [ "$QUERY" == '$originators' ]; then - bmx7 -c --jshow originators /r=0 - exit 0 - - else - check_path "$BMX7_DIR/$QUERY" - print_query $QUERY - exit 0 - fi - fi -fi -fi - -ls -1F "$BMX7_DIR" -exit 0 - diff --git a/luci-app-bmx7/files/www/luci-static/resources/bmx7/bmx7logo.png b/luci-app-bmx7/files/www/luci-static/resources/bmx7/bmx7logo.png deleted file mode 100644 index c7d9ceafaeb7e11706f9363f4b97f4cd4d4ada2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5121 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