Commit Graph
100 Commits
Author SHA1 Message Date
Jo-Philipp Wich a36a73cbdc Merge pull request #457 from jplitza/master
luci-lib-jsonc: fix handling of strange keys, allow encoding []
2015-08-30 17:57:00 +02:00
Jo-Philipp Wich 0ecd6974a8 Merge pull request #454 from hnyman/fix-entropy
statistics: entropy plugin - fix placement of entropy.lua
2015-08-28 12:06:25 +02:00
Jo-Philipp Wich 8597b86ebf Merge pull request #444 from hnyman/fixconntrack
statistics: fix conntrack and ping regression caused by collectd changes
2015-08-19 10:08:42 +02:00
Jo-Philipp Wich 376f038726 luci-lib-nixio: pass exact sockaddr length to getnameinfo()
Musl libc requires the length parameter of getnameinfo() to be exactly
`sizeof(struct sockaddr_in)` or `sizeof(struct sockaddr_in6)`, depending on
the passed sockaddr family.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-07-30 22:38:36 +02:00
Jo-Philipp Wich 3610f3222d luci-mod-rpc: move luci config require into the authentication function (#427)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-07-15 23:28:16 +02:00
Jo-Philipp Wich 16047d03c5 luci-mod-rpc: add missing luci config require
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-07-15 22:30:45 +02:00
Jo-Philipp Wich 74b5c1bbc3 luci-mod-admin-full: restart the firewall instead of reloading it
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-07-03 16:59:51 +02:00
Jo-Philipp Wich 0ef5f3c693 contrib/firefunk-watchdog: fix build against musl
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-06-25 14:19:51 +02:00
Jo-Philipp Wich 23dba10808 Merge pull request #424 from kdarbyshirebryant/master
luci-app-upnp: Stop sys upgrade disabling miniupnpd service on first boot after upgrade
2015-06-24 12:16:23 +02:00
Jo-Philipp Wich eac90c78fb Merge pull request #419 from dangowrt/fix-olsr-json-dependency
luci-app-olsr: depend on luci-lib-json
2015-06-16 18:27:09 +02:00
Jo-Philipp Wich e8029d6398 Fix markup in Template reference 2015-06-16 10:21:47 +02:00
Jo-Philipp Wich dde25048b9 Fix links in ThemesHowTo.md 2015-06-16 10:17:28 +02:00
Jo-Philipp Wich 4b11843e4c Add documentation converted from old Trac wiki pages
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-06-16 10:11:45 +02:00
Jo-Philipp Wich 37a9d6aee7 Merge pull request #414 from maz-1/mjpg-update
add chinese translations for luci-app-mjpg-streamer
2015-06-16 09:56:30 +02:00
Jo-Philipp Wich edf0f4f549 Merge pull request #402 from NeoRaider/json-empty-object
luci-lib-json: ignore null keys to allow encoding empty objects
2015-06-10 10:20:49 +02:00
Jo-Philipp Wich d2638a7a0e Merge pull request #389 from hnyman/timezone2015d
Timezone information is updated to 2015d, released on 24 Apr 2015.
2015-06-10 10:19:19 +02:00
Jo-Philipp Wich abc1ed6148 Merge pull request #403 from hnyman/fix-qos-l7
luci-app-qos: remove l7 options
2015-06-07 17:13:48 +02:00
Jo-Philipp Wich 1dada8cc44 luci-base: prevent parsing the form input after cbi emergency save
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-26 17:32:11 +02:00
Jo-Philipp Wich d6d0926aee Merge pull request #388 from oneru/fwknop-qr
Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in th…
2015-05-26 17:14:24 +02:00
Jo-Philipp Wich fe14cd5a66 luci-base: fallback to a simple text editor if uci config cannot be loaded
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-26 17:12:42 +02:00
Jo-Philipp Wich 03610cee3a luci-base: rename .gitignore to .placeholder
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-26 16:27:05 +02:00
Jo-Philipp Wich 64b728a2df Merge pull request #384 from nightcoffee/nightcoffee-patch-1
luci-base: Add cache control in index.html
2015-05-21 14:51:30 +02:00
Jo-Philipp Wich ec48d2d01f Merge pull request #385 from oneru/fwknop-qr
luci-app-fwknopd: Add qr code support
2015-05-20 20:26:59 +02:00
Jo-Philipp Wich a7083780de collections/luci: depend on luci-proto-ipv6 if IPV6 is enabled
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-06 16:00:33 +02:00
Jo-Philipp Wich 6fb24acb38 Merge pull request #331 from poranje/proto=ipv6+aiccu+fixes
luci-proto-ipv6: fix aiccu requiretls
2015-05-06 15:42:53 +02:00
Jo-Philipp Wich c38b4cdffa luci.mk: don't builtin translations selected by CONFIG_ALL
Make sure that translation packages enabled through CONFIG_ALL
that depend on builtin packages are restricted to modules.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-05 10:32:15 +02:00
Jo-Philipp Wich 36879e9e86 Merge pull request #374 from wongsyrone/patch-1
luci-app-ddns: fix Simplified Chinese translations
2015-04-28 15:56:15 +02:00
Jo-Philipp Wich 58a42eaf9b Merge pull request #358 from freifunk-leipzig/master
luci-mod-admin-full: change adress to an ipv6-enabled host
2015-04-27 15:09:17 +02:00
Jo-Philipp Wich 70ffeb36db Merge pull request #370 from 981213/pull_request
Fix some Simplified Chinese translations in luci.
2015-04-27 15:08:21 +02:00
Jo-Philipp Wich 2243a3f937 Merge pull request #371 from aidvu/fstab-swap
luci-mod-admin-full: mount points SWAP fix
2015-04-27 15:06:42 +02:00
Jo-Philipp Wich 6a13d73c29 Synchronize translations
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-04-20 10:35:08 +02:00
Jo-Philipp Wich 5fd8761583 build: rework i18n-sync.sh to support new structure
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-04-20 10:17:23 +02:00
Jo-Philipp Wich 661c33ba91 luci-app-ahcp: remove leftover po templates
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-04-20 10:08:23 +02:00
Jo-Philipp Wich 29004d9552 Update .gitignore
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-04-20 10:08:23 +02:00
Jo-Philipp Wich 493662e7fb Merge pull request #361 from hnyman/timezone2015c
Timezone data: Update to 2015c
2015-04-19 13:12:53 +02:00
Jo-Philipp Wich ec09e995a8 luci-mod-admin-full: handle missing size for block devices
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-04-17 12:39:11 +02:00
Jo-Philipp Wich 622cfc673a luci-mod-admin-full: simply fstab configuration
Simplify fstab setup by offering hints for uuid/label and device node options.
Fix rootfs handling logic by removing obsolete references to the "is_rootfs"
option and offering "/" and "/overlay" choices for the mountpoint instead.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-04-12 20:20:01 +02:00
Jo-Philipp Wich 576e235d0b Merge pull request #355 from nmav/no-defaultroute
luci-proto-openconnect: Added option for default gateway
2015-03-31 16:07:29 +02:00
Jo-Philipp Wich 6160a53ab9 luci-base: fix backslash escaping in luci.util.serialize_json()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-03-18 12:43:29 +01:00
Jo-Philipp Wich 4ab6dcea9b Merge pull request #336 from legendtang/fix
luci-base: fix wrong pattern of urlencode() (encode '+' properly) #182
2015-03-10 18:56:41 +01:00
Jo-Philipp Wich dd2b05289b Merge pull request #304 from nmav/ocserv-crypt
luci-app-ocserv: uclibc's crypt() doesn't support sha2crypt
2015-03-10 18:55:46 +01:00
Jo-Philipp Wich 31e7adea63 Merge pull request #333 from legendtang/master
themes/bootstrap: add media queries to bootstrap-theme for better responsive UI on mobile devices
2015-03-10 18:55:15 +01:00
Jo-Philipp Wich 6f56c69d63 Merge pull request #338 from chris5560/master-app-privoxy
luci-app-privoxy: cleanup and fixes for #298 #334 #335
2015-03-10 18:54:24 +01:00
Jo-Philipp Wich 4c9ddbc969 Merge pull request #339 from Seak/master
ifaces.lua:fix generating /etc/config/dhcp section
2015-03-10 18:53:37 +01:00
Jo-Philipp Wich d539eb4d13 Merge pull request #337 from chris5560/master-app-ddns
luci-app-ddns: patches for #298 #334 #335
2015-03-10 18:49:10 +01:00
Jo-Philipp Wich 965c6315bf Merge pull request #340 from hnyman/png-close-logspam
luci-statistics: fix uhttpd log spam from extra png close
2015-03-10 18:48:15 +01:00
Jo-Philipp Wich de5ec52b87 Merge pull request #334 from legendtang/fix
theme/bootstrap: add a mssing class style in form section (#298)
2015-02-28 19:16:54 +01: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 f47be40cd4 Merge pull request #325 from chris5560/master-app-ddns
luci-app-ddns: update to version 2.2.0-1
2015-02-28 13:25:57 +01:00
Jo-Philipp Wich ec1a86977b Avoid setting duplicate cookies
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-02-09 16:30:11 +01:00
Jo-Philipp Wich ec90cd69ed luci-base: pass session timeout as integer
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-02-09 13:03:44 +01:00
Jo-Philipp Wich 240458ea8a luci-mod-freifunk: fix public status page
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-02-09 12:15:06 +01:00
Jo-Philipp Wich 993cf12229 luci-base: establish ubus connection before dropping privileges (#310)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-02-09 12:14:20 +01:00
Jo-Philipp Wich 76dfdc1b1e Merge pull request #302 from chris5560/master
luci-themes: luci.main.mediaurlbase not set correctly
2015-02-08 19:57:20 +01:00
Jo-Philipp Wich 6b1b7336f0 Merge pull request #320 from chris5560/master
admin_network: interface details, implement "Back to Overview" button
2015-02-08 19:22:45 +01:00
Jo-Philipp Wich 1abe6fa10c Merge pull request #315 from poranje/proto-ipv6+aiccu
luci-proto-ipv6: add aiccu
2015-02-08 19:18:16 +01:00
Jo-Philipp Wich cd24ad05a4 Merge pull request #305 from nmav/compression
luci-app-ocserv: Added option to enable compression
2015-02-08 19:13:39 +01:00
Jo-Philipp Wich a0f0e008f7 Merge pull request #319 from nmav/oc-iface
openconnect: ask for the output interface name
2015-02-08 19:13:12 +01:00
Jo-Philipp Wich 4ba597b15c Merge pull request #317 from hnyman/fix-zoneinfo2lua
zoneinfo2lua.pl to generate shorter copyright messages
2015-02-06 11:02:58 +01:00
Jo-Philipp Wich 5b28e722d0 Merge pull request #316 from hnyman/timezone-2015a
Timezone data: Update to 2015a
2015-02-06 11:02:40 +01:00
Jo-Philipp Wich 84346cd178 Move inline documentation into separate files.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-29 16:26:46 +01:00
Jo-Philipp Wich cf7e2695cc luci-lib-jsonc: add api documentation
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-28 22:31:28 +01:00
Jo-Philipp Wich 7ca5222f4b luci-lib-ip: add api documentation
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-28 22:31:14 +01:00
Jo-Philipp Wich fb69e15e8d luci-lib-nixio: move CHANGELOG and README into nixio namespace
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-28 22:29:45 +01:00
Jo-Philipp Wich d1c1423eba build: remove *.luadoc files before packaging 2015-01-28 22:29:03 +01:00
Jo-Philipp Wich 8464b98bb4 Remove outdated luadoc from contrib
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-28 22:28:29 +01:00
Jo-Philipp Wich c669c01cea build: add modified luadoc for use with LuCI sources
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-28 22:28:04 +01:00
Jo-Philipp Wich e6e74b712f luci-lib-ip: add functions to deal with IPv6 mapped IPv6
* Add luci.ip.cidr.is6mapped4() to test whether an IPv6 CIDR is a mapped IPv4 one
 * Add luci.ip.cidr.mapped4() to derive IPv4 from mapped CIDR
 * Remove mapped IPv4 workaround from constructor as it breaks genuine addrs like ::ffff:0

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-28 14:21:04 +01:00
Jo-Philipp Wich 65f0135491 luci-lib-ip: multiple fixes
* Fix broken neighbor filtering by address range due to uninitialized memory
 * Fix wrong sizeof in _cidr_add_sub when adding/substracing IPv6 addresses
 * Properly convert numeric values to IPv6 addresses

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-28 13:23:24 +01:00
Jo-Philipp Wich 44a62295f9 luci-app-firewall: rework internal/external zone list handling when adding forwards
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-26 17:55:09 +01:00
Jo-Philipp Wich 83d520ab07 luci-base: improve login/logout handling
Redirect to the canonical url after login and redirect to an url without
security token if the session expired. Also make sure that the login page
is served with status code 403, not 200 to give ajax calls a chance to
detect expired sessions.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-26 17:31:21 +01:00
Jo-Philipp Wich 73b19f6382 libs: add luci-lib-jsonc, a Lua binding for JSON-C
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-26 16:49:23 +01:00
Jo-Philipp Wich 8c8c69fa5d luci-lib-ip: accept 2nd netmask argument in new(), IPv4() and IPv6()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-26 10:47:39 +01:00
Jo-Philipp Wich 0d32e69f16 luci-lib-ip: fix segfault in link() on systems with ip6gre support
If an ip6gre interface is queried, the resulting link local address string
of 47 byte overflowed the buffer of 32 bytes used to hold the translated
address.

Increase the address string buffer to 48 byte and check the address length
prior to writing it into the buffer to avoid future problems with longs
link local addresses.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-25 21:39:17 +01:00
Jo-Philipp Wich 5317b09be7 luci-app-privoxy: fix path to luci.mk after move
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-25 18:30:07 +01:00
Jo-Philipp Wich c69bbad727 Merge pull request #308 from chris5560/master
luci-app-privoxy: move from openwrt/packages to openwrt/luci
2015-01-25 12:36:50 +01:00
Jo-Philipp Wich 9feb1b8a78 luci-mod-admin-full: use sysupgrade -T to test images
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-24 14:26:51 +01:00
Jo-Philipp Wich eb1ef783f6 luci-lib-ip: fix netlink receiving in link()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-24 14:25:53 +01:00
Jo-Philipp Wich 40066a6799 luci-base: optimize luci.tools.webadmin.iface_get_network()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-23 15:26:33 +01:00
Jo-Philipp Wich 671566d701 luci-lib-ip: add link() method to get basic iface info
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-23 13:00:51 +01:00
Jo-Philipp Wich 4ab9f972c4 luci-lib-ip: always return table for dump, even if empty
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 23:59:11 +01:00
Jo-Philipp Wich 6c16f97c4c luci-base: remove unused functions from luci.sys.net
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 23:55:11 +01:00
Jo-Philipp Wich e85698638f luci-lib-ip: support filtering neighbors by mac or dest addr
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 23:43:56 +01:00
Jo-Philipp Wich 1d461b6e7e luci-app-splash: convert ip4mac() to luci.ip.neighbors()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 22:07:50 +01:00
Jo-Philipp Wich fac0228313 luci-app-splash: convert luci.sys.net.arptable() to luci.ip.neighbors()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 21:57:00 +01:00
Jo-Philipp Wich b24dfd52ac luci-mod-admin-mini: convert luci.sys.net.arptable() to luci.ip.neighbors()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 18:50:00 +01:00
Jo-Philipp Wich 213595ce85 luci-mod-admin-full: convert luci.sys.net.arptable() to luci.ip.neighbors()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 18:45:28 +01:00
Jo-Philipp Wich 577b772824 luci-base: rewrite luci.tools.webadmin and remove unused functions
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 18:25:49 +01:00
Jo-Philipp Wich 44ee102ff9 luci-app-olsr: rewrite mac address resolving
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 17:52:44 +01:00
Jo-Philipp Wich 7dc9f86749 luci-mod-freifunk: switch to luci.ip route functions
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 16:44:01 +01:00
Jo-Philipp Wich 625a89a370 luci-app-coovachilli: switch to luci.ip route functions
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 16:36:18 +01:00
Jo-Philipp Wich feb576413b luci-app-siitwizard: switch to luci.ip route functions
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 16:29:35 +01:00
Jo-Philipp Wich 5b94c1cca2 luci-mod-admin-full: switch to luci.ip route functions
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 15:53:16 +01:00
Jo-Philipp Wich e9bfa5fe79 luci-lib-ip: fix routes() for non-callback invocations
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 15:25:41 +01:00
Jo-Philipp Wich b48386be67 luci-app-olsr: use luci.ip.routes() to find default gw
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 15:12:56 +01:00
Jo-Philipp Wich 0e90bf98df luci-base: depend on luci-lib-ip and remove ip.lua
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 15:08:09 +01:00
Jo-Philipp Wich 8cf1b1374d luci-lib-nixio: always assume Linux target (#307)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 15:01:50 +01:00
Jo-Philipp Wich 0ff02e3a13 libs: add luci-lib-ip
Add new luci.ip library which is an api compatible C reimplementation
of ip.lua. It also supports dumping the system routing table and neighbour
entry database via netlink.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 15:01:50 +01:00
Jo-Philipp Wich 390c4bd5a7 luci-base: use serialize_json() in luci.http
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 15:01:50 +01:00
Jo-Philipp Wich 61a9a58efc luci-base: add luci.util.serialize_json()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 15:01:50 +01:00