Commit graph

19 commits

Author SHA1 Message Date
Jo-Philipp Wich
98f4c3cf50
Merge pull request #1933 from Ansuel/hostname_upnp
luci-app-upnp: add hostname info
2018-07-13 14:50:28 +02:00
Jo-Philipp Wich
5722105007 luci-app-upnp: tweak table markup
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-13 09:37:28 +02:00
Ansuel Smith
afd14fb9c7
luci-app-upnp: add hostname info
This adds the hostname info in the index page of luci.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
2018-07-03 17:46:39 +02:00
Jo-Philipp Wich
485e5c930f luci-app-upnp: cleanup UPnP lease status markup
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-06-28 09:43:45 +02:00
Jo-Philipp Wich
ce8101ae75 luci-app-upnp: rework lease status indicator
Turn the dynamic lease status table into responsive table by using the
cbi_update_table() helper in conjunction with title annotation attributes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-06-23 18:01:43 +02:00
Jo-Philipp Wich
067d7dc9f7 treewide: convert HTML tables to div
Mostly convert HTML tables to div based markup to allow for easier styling
in the future. Also change JS accessor code accordingly.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-28 15:18:45 +02:00
Kevin Darbyshire-Bryant
ea02940c0e luci-app-upnp: change leasefile location hint
Change default leasefile hint from /var/log/upnp.leases to
/var/run/miniupnpd.leases

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2018-05-09 20:05:44 +01:00
Kevin Darbyshire-Bryant
0ddc0596af luci-app-upnp: support igdv1 run time flag
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2018-05-02 21:53:36 +01:00
Jo-Philipp Wich
c0d9c4f3ce treewide: filter shell arguments through shellquote() where applicable
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-04-05 09:37:43 +02:00
Jo-Philipp Wich
b2274e5d6d
Merge pull request #980 from NvrBst/pull-request-upnp_description
luci-app-upnp: Adding and displaying "Description" to upnp data
2017-11-10 13:06:10 +01:00
Kevin Darbyshire-Bryant
1093327a4d luci-minuupnpd: use enable flag
Add a 'master' miniupnpd service enable flag rather than just relying on
rcS.d script existence.  This allows the service to be disabled
across sysupgrade, similar to minidlna.

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2017-02-23 09:49:56 +00:00
Cody R. Brown
dd0b5cfd16 luci-app-upnp: Adding and displaying "Description" to upnp data
Getting the Description data from upnp_lease_file. This data often displays the Application Name which made the upnp call. If the upnp_lease_file doesn't exist, it'll just return a blank entry under "Description".

upnp_lease_file order example: TCP:33333:192.168.0.100:33333:1485578298:NAT-PMP 33333 tcp
As an optimisation, since the upnp_lease_file has only active leases and is ordered by epoch timestamp (5th column above), and since "iptables --line-numbers -t nat -xnvL MINIUPNPD" has active leases and is also displayed in order of rule applied (time). This means the order of these two sources will be the same. This prevents us from "searching" the upnp_lease_file for every rule, and instead for the n'th rule, look at the n'th upnp_lease_file line. As a result we only need to read in one line at a time. For a safety, the upnp_lease_file description is always checked to see if it matches the rule it's being assigned to. If it doesn't match it'll return blank. This means we'll never put an incorrect description to a upnp rule, even if someone messes with the upnp_lease_file.
This is the case on my system, more testing may be necessary? If this is false we'll need to loop over the upnp_lease_file for every rule, or read in the whole upnp_lease_file once for the iptables loop.

The Description column is added to the upnp_status, and the "Delete Redirect" renamed to "Delete" to make more horizontal space in the table.

Signed-off-by: Cody R. Brown <dev@codybrown.ca>
2017-01-28 07:20:23 -08:00
Oliver Middleton
ba349ad693 fix string "UPNP" -> "UPnP"
Signed-off-by: Oliver Middleton <olliemail27@gmail.com>
2015-10-28 01:13:37 +00:00
Jo-Philipp Wich
f23f7b8751 luci-app-upnp: protect lease delete call with csrf token
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-21 00:11:28 +02:00
Jo-Philipp Wich
281d2f6178 Globally replace luci.dispatcher.build_url(...) with url(...) invocations
Also concat multiple string arguments into one while we're at it.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-10-07 19:07:36 +02:00
Jo-Philipp Wich
cf4b89b06b luci-app-upnp: supress stderr when listing MINIUPNPD chain
Current OpenWrt trunk now relays uhttpd stderr to syslog, so don't spam
it with "iptables: No chain/target/match by that name." when miniupnpd
is not configured but its status is queried by an overview page applet.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-02-28 19:07:36 +01:00
Jo-Philipp Wich
41d2b33087 Update my email addresses in the license headers
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-16 23:49:44 +01:00
Jo-Philipp Wich
7a3493b1f7 Globally reduce copyright headers
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-16 23:38:38 +01:00
Jo-Philipp Wich
1bb4822dca Rework LuCI build system
* Rename subdirectories to their repective OpenWrt package names
 * Make each LuCI module its own standalone package
 * Deploy a shared luci.mk which is used by each module Makefile

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-08 16:26:20 +01:00