Commit Graph
100 Commits
Author SHA1 Message Date
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
Jo-Philipp Wich 4b2d2e3603 Merge pull request #306 from Preffer/master
libs/luci-lib-httpclient: fix not straightforward behavior of httpclient
2015-01-22 12:06:05 +01:00
Jo-Philipp Wich 0d541a4cbd Merge pull request #299 from nmav/ocserv-match
luci-app-ocserv: modified match to apply to newer versions of occtl
2015-01-19 18:39:10 +01:00
Jo-Philipp Wich c96d986645 Merge pull request #301 from nmav/ocserv4
luci-app-ocserv: express PKID in a way that is acceptable by openconnect
2015-01-19 18:38:51 +01:00
Jo-Philipp Wich 3efb9ed60b Merge pull request #297 from chris5560/master
luci-app-ddns: Update to version 2.1.1-0
2015-01-19 18:37:41 +01:00
Jo-Philipp Wich 52ecc90b31 luci.mk: expose option to override PKGARCH (#295)
Also mark packages without src/ as arch independant by default.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-18 17:27:16 +01:00
Jo-Philipp Wich 30d45d0c0e themes: fix load number formatting
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-17 15:17:42 +01:00
Jo-Philipp Wich 4abf1caa3f luci-theme-openwrt: fix version display
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-17 00:40:31 +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 9980114624 luci-base: remove luci.init
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-16 21:40:49 +01:00
Jo-Philipp Wich 9e1383dd40 luci-mod-admin-full: directly require luci.version and fetch uname with library call
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-16 21:40:49 +01:00
Jo-Philipp Wich 2ebc394347 luci-base: use local sys module table in luci.dispatcher
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-16 21:40:49 +01:00
Jo-Philipp Wich daee4a650e themes: require luci.version directly
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-16 21:40:49 +01:00
Jo-Philipp Wich 9d908ffd78 luci-app-olsr: add workaround for finding default gw with policy routing
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-16 21:40:49 +01:00
Jo-Philipp Wich bba6454b8f Merge pull request #294 from luizluca/luci-proto-3g_add-dialnumber
luci-proto-3g: add dialnumber option
2015-01-16 20:51:02 +01:00
Jo-Philipp Wich 224325a36d protocols: fix keepalive settings for pppd based protocols
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 22:55:37 +01:00
Jo-Philipp Wich 458469bb4f luci-mod-admin-full: display routers localtime again
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 17:41:26 +01:00
Jo-Philipp Wich a35fffe3c3 luci-mod-admin-full: fix missing nixio.fs require
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 16:34:48 +01:00
Jo-Philipp Wich 7aa838988f luci-base: remove old fastindex support code, use cached module tables
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 16:32:03 +01:00
Jo-Philipp Wich 575e1093ab luci-lib-nixio: drop "bit" compatibility class
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 16:05:31 +01:00
Jo-Philipp Wich 6043fe9433 luci-app-siitwizard: explicitely require bit library
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 16:04:54 +01:00
Jo-Philipp Wich e2ec170445 luci-base: remove unconditional "bit" preloading
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 16:02:54 +01:00
Jo-Philipp Wich 6ff7bae36a luci-mod-admin-full: remove useless "bit" requires
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 16:02:25 +01:00
Jo-Philipp Wich e91b603acc luci-base: drop luci.fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 15:40:33 +01:00
Jo-Philipp Wich 6cc1ae506c luci-mod-failsafe: switch to nixio.fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 15:40:05 +01:00
Jo-Philipp Wich b7f80a98d8 luci-mod-admin-full: switch to nixio.fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 15:37:46 +01:00
Jo-Philipp Wich 9780ee382e luci-mod-freifunk: switch to nixio.fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 15:11:57 +01:00
Jo-Philipp Wich 921df0f3fc luci-theme-freifunk-generic: switch to nixio.fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 15:09:02 +01:00
Jo-Philipp Wich 831a8cb13d luci-app-multiwan: switch to nixio.fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 15:06:03 +01:00
Jo-Philipp Wich 924202156e luci-app-splash: switch to nixio.fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 15:05:06 +01:00
Jo-Philipp Wich bca0643eda luci-app-olsr-services: switch to nixio.fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 15:04:04 +01:00
Jo-Philipp Wich 7298099b02 luci-app-freifunk-widgets: switch to nixio.fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 15:03:18 +01:00
Jo-Philipp Wich 2af6fac809 luci-app-olsr: switch to nixio.fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 14:55:46 +01:00
Jo-Philipp Wich 76eb057b2c luci-mod-base: drop luci.sys.sysinfo() and luci.sys.loadavg()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 14:26:36 +01:00
Jo-Philipp Wich bfbc7f4bdf themes: eliminate uses of luci.sys.loadavg()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 14:26:27 +01:00
Jo-Philipp Wich 64d0031233 luci-mod-freifunk: eliminate uses of luci.sys.sysinfo()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 14:11:35 +01:00
Jo-Philipp Wich a1f67784c9 luci-mod-admin-mini: remove uses of luci.sys.sysinfo()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 13:44:38 +01:00
Jo-Philipp Wich 46beca9fb1 luci-mod-admin-full: eliminate the use of luci.sys.sysinfo()
Fetch the required information via ubus instead of relying on the
to-be-removed luci.sys.sysinfo() and luci.sys.loadavg() functions.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 13:35:10 +01:00
Jo-Philipp Wich 0b491a05ca luci-lib-px5g: disable MIPS16
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 11:12:11 +01:00
Jo-Philipp Wich c159d28091 luci-base: switch luci.model.network to common ubus api
Replaces the ubus calls in luci.model.network with the common api
from luci.util.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 11:10:02 +01:00
Jo-Philipp Wich 199c8cbc4c luci-base: switch to ubus sessions
Remove luci.sauth session storage implementation and offload the session
management to the rpcd ubus backend. Also depend on rpcd due to this.
2015-01-15 11:09:05 +01:00
Jo-Philipp Wich eb8560061a luci-base: add luci.util.ubus()
Add luci.util.ubus() convenience wrapper which establishes a connection on
the first call.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 11:03:31 +01:00
Jo-Philipp Wich 00da2bbbd2 build: add po2lmo to .gitignore (#292) 2015-01-15 09:49:19 +01:00
Jo-Philipp Wich a850efc0ee Merge pull request #290 from chris5560/master
luci.mk: cosmetic change for translation description
2015-01-11 17:42:02 +01:00
Jo-Philipp Wich 99d4d5e454 luci-app-ushare: mark as broken since ushare is in oldpackages
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-11 17:39:46 +01:00
Jo-Philipp Wich e55b23c6ac luci-mod-admin-full: fix luci-bwc compilation
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-11 16:22:20 +01:00
Jo-Philipp Wich 546de2c81c Merge pull request #289 from chris5560/master
luci-app-ddns: adaption to new luci structure and cleanup
2015-01-11 00:27:14 +01:00
Jo-Philipp Wich 1ce2d8f46a build: rework language dependencies
Rework the language package dependencies to avoid introducing unnecessary
depends. The luci-i18n-$app-$lang packages now depend on luci-$app.

 * When a language is selected as <*> then the language packs for each
   enabled LuCI module are built into the image
 * When a language is selected as <m> then the language packs for each
   enabled LuCI module are built as package
 * When CONFIG_ALL is set (e.g. release builds, snapshots) then all
   language packs are built

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-10 23:36:26 +01:00
Jo-Philipp Wich c5477f717d Merge pull request #288 from chris5560/master
Modified dependencies
2015-01-10 22:39:41 +01:00
Jo-Philipp Wich 9a81d8ff32 luci-base: handle missing translations in template engine
Previously the template engine did not interpolate translation macros if no
translation catalogue could be loaded due to a missing i18n directory.

Change the offending code to return the original string in any error case.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-10 21:19:54 +01:00
Jo-Philipp Wich 1380c7b07d luci-base: add depends on libubus-lua and luci-lib-nixio as well
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-10 19:58:06 +01:00
Jo-Philipp Wich 26aefe4f69 luci-base: depend on libuci-lua
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-10 19:54:05 +01:00
Jo-Philipp Wich a36807b942 build: fix language dependency handling
Turn language selection into a tristate, this allows building language
packages without having them included in the image.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-10 14:20:18 +01:00
Jo-Philipp Wich c97011fd97 luci-base: fix dependency on lua (#284)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-10 13:42:42 +01:00
Jo-Philipp Wich 3afecbd8ab luci-base: depend on Lua (#283)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-09 16:35:23 +01:00
Jo-Philipp Wich 6ee776863a luci-app-ahcp: remove empty src directory
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-09 13:23:34 +01:00
Jo-Philipp Wich f4fb587125 luci-lib-px5g: add missing src Makefile and fix depends
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-09 13:19:28 +01:00
Jo-Philipp Wich 3c6d03ddee luci-lib-luaneightbl: add src Makefile and fix dependencies (#282)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-09 13:04:01 +01:00
Jo-Philipp Wich db653649ff luci-mod-admin-full: fix build dep spec in previous commit (#281)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-08 22:24:25 +01:00
Jo-Philipp Wich 80c06a773d luci-mod-admin-full: add build dependency on libiwinfo
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-08 22:17:36 +01:00