[Zrouter-src] ZRouter.org: push to ZRouter profiles/SMALL_/files/etc/bin/updat...
zrouter-src at zrouter.org
zrouter-src at zrouter.org
Mon Feb 6 11:00:18 UTC 2012
details: http://zrouter.org/hg/zrouter//rev/67a155d37199
changeset: 341:67a155d37199
user: ray at terran.dlink.ua
date: Mon Feb 06 13:01:03 2012 +0200
description:
Big whitespace cleanup
diffstat:
profiles/SMALL_/files/etc/bin/update | 2 +-
profiles/SMALL_/files/etc/defaults/rc.conf | 704 +++++-----
profiles/SMALL_/files/etc/network.subr | 8 +-
profiles/SMALL_/files/etc/networks | 8 +-
profiles/SMALL_/files/etc/rc.firewall | 4 +-
profiles/SMALL_/files/etc/rc.shutdown | 2 +-
profiles/SMALL_/files/etc/save_etc | 2 +-
profiles/dlink.ua.web/files/etc/dhclient-script | 4 +-
profiles/dlink.ua.web/files/etc/mpd-linkdown | 4 +-
profiles/dlink.ua.web/files/etc/mpd-linkup | 4 +-
profiles/dlink.ua.web/files/etc/racoon/phase1-down.sh | 2 +-
profiles/dlink.ua.web/files/etc/racoon/phase1-up.sh | 2 +-
profiles/dlink.ua.web/files/etc/www/collector.lua | 25 +-
profiles/dlink.ua.web/files/etc/www/config.xml | 4 +-
profiles/dlink.ua.web/files/etc/www/devd.lua | 20 +-
profiles/dlink.ua.web/files/etc/www/htdocs/Administration.firmware.html | 2 +-
profiles/dlink.ua.web/files/etc/www/htdocs/Administration.info.html | 2 +-
profiles/dlink.ua.web/files/etc/www/htdocs/Basic.lan.html | 2 +-
profiles/dlink.ua.web/files/etc/www/htdocs/Basic.wan.html | 6 +-
profiles/dlink.ua.web/files/etc/www/htdocs/Basic.wlan.html | 10 +-
profiles/dlink.ua.web/files/etc/www/htdocs/Security.IPSec.html | 2 +-
profiles/dlink.ua.web/files/etc/www/htdocs/css/router.css | 52 +-
profiles/dlink.ua.web/files/etc/www/htdocs/js/ajax.js | 10 +-
profiles/dlink.ua.web/files/etc/www/htdocs/js/defineMyTree.js | 4 +-
profiles/dlink.ua.web/files/etc/www/htdocs/js/tree.js | 128 +-
profiles/dlink.ua.web/files/etc/www/htdocs/js/utils.js | 1 -
profiles/dlink.ua.web/files/etc/www/htdocs/js/view.js | 2 +-
profiles/dlink.ua.web/files/etc/www/htdocs/vaps.lua | 30 +-
profiles/dlink.ua.web/files/etc/www/httpd.lua | 60 +-
profiles/dlink.ua.web/files/etc/www/lib/base64.lua | 2 +-
profiles/dlink.ua.web/files/etc/www/lib/handler.lua | 117 +-
profiles/dlink.ua.web/files/etc/www/lib/ipcalc.lua | 2 +-
profiles/dlink.ua.web/files/etc/www/lib/mime.lua | 2 +-
profiles/dlink.ua.web/files/etc/www/lib/mpd.lua | 7 +-
profiles/dlink.ua.web/files/etc/www/lib/node.lua | 2 +-
profiles/dlink.ua.web/files/etc/www/lib/racoon.lua | 12 +-
profiles/dlink.ua.web/files/etc/www/lib/socket/http.lua | 14 +-
profiles/dlink.ua.web/files/etc/www/lib/socket/url.lua | 2 +-
profiles/dlink.ua.web/files/etc/www/lib/utils.lua | 6 +-
profiles/dlink.ua.web/files/etc/www/lib/xml.lua | 152 +-
profiles/xSMALL_/files/etc/bin/update | 2 +-
profiles/xSMALL_/files/etc/defaults/rc.conf | 704 +++++-----
profiles/xSMALL_/files/etc/network.subr | 8 +-
profiles/xSMALL_/files/etc/networks | 8 +-
profiles/xSMALL_/files/etc/rc.d/MAIN | 4 +-
profiles/xSMALL_/files/etc/rc.firewall | 4 +-
profiles/xSMALL_/files/etc/rc.shutdown | 2 +-
profiles/xSMALL_/files/etc/save_etc | 2 +-
profiles/zhttpd/profile.mk | 4 +-
49 files changed, 1114 insertions(+), 1048 deletions(-)
diffs (3917 lines):
diff -r da08f56b0dc9 -r 67a155d37199 profiles/SMALL_/files/etc/bin/update
--- a/profiles/SMALL_/files/etc/bin/update Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/SMALL_/files/etc/bin/update Mon Feb 06 13:01:03 2012 +0200
@@ -66,7 +66,7 @@
if [ "x${fwURL}" != "x" ]; then
echo "Updating system image to type ${UPDATE_TYPE}, version ${fwExternal}.${fwInternal}"
fetch -o /tmp/fw.img "${fwURL}" || exit 1
- upgrade -f /tmp/fw.img
+ upgrade -f /tmp/fw.img
fi
diff -r da08f56b0dc9 -r 67a155d37199 profiles/SMALL_/files/etc/defaults/rc.conf
--- a/profiles/SMALL_/files/etc/defaults/rc.conf Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/SMALL_/files/etc/defaults/rc.conf Mon Feb 06 13:01:03 2012 +0200
@@ -1,369 +1,369 @@
-rc_debug="NO"
-rc_info="NO"
-rc_startmsgs="YES"
-rcshutdown_timeout="30"
-early_late_divider="FILESYSTEMS"
-swapfile="NO"
-apm_enable="NO"
-apmd_enable="NO"
-apmd_flags=""
-ddb_enable="NO"
-ddb_config="/etc/ddb.conf"
-cdevd_enable="YES"
-cdevd_flags=""
+rc_debug="NO"
+rc_info="NO"
+rc_startmsgs="YES"
+rcshutdown_timeout="30"
+early_late_divider="FILESYSTEMS"
+swapfile="NO"
+apm_enable="NO"
+apmd_enable="NO"
+apmd_flags=""
+ddb_enable="NO"
+ddb_config="/etc/ddb.conf"
+cdevd_enable="YES"
+cdevd_flags=""
buttons_pins=""
buttons_gpioc_dev="/dev/gpioc0"
-kldxref_enable="NO"
-kldxref_clobber="NO"
-kldxref_module_path=""
-powerd_enable="NO"
-powerd_flags=""
-tmpmfs="AUTO"
-tmpsize="20m"
-tmpmfs_flags="-S"
-varmfs="AUTO"
-varsize="32m"
-varmfs_flags="-S"
-populate_var="AUTO"
-cleanvar_enable="YES"
-local_startup="/usr/local/etc/rc.d"
-script_name_sep=" "
+kldxref_enable="NO"
+kldxref_clobber="NO"
+kldxref_module_path=""
+powerd_enable="NO"
+powerd_flags=""
+tmpmfs="AUTO"
+tmpsize="20m"
+tmpmfs_flags="-S"
+varmfs="AUTO"
+varsize="32m"
+varmfs_flags="-S"
+populate_var="AUTO"
+cleanvar_enable="YES"
+local_startup="/usr/local/etc/rc.d"
+script_name_sep=" "
rc_conf_files="/etc/rc.conf /etc/rc.conf.local"
-zfs_enable="NO"
-gbde_autoattach_all="NO"
-gbde_devices="NO"
-gbde_attach_attempts="3"
-gbde_lockdir="/etc"
-geli_devices=""
-geli_tries=""
-geli_default_flags=""
-geli_autodetach="YES"
-geli_swap_flags="-e aes -l 256 -s 4096 -d"
-root_rw_mount="YES"
-fsck_y_enable="NO"
-fsck_y_flags=""
-background_fsck="YES"
-background_fsck_delay="60"
-netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS"
-extra_netfs_types="NO"
-hostname=""
-hostid_enable="YES"
-hostid_file="/etc/hostid"
-nisdomainname="NO"
-dhclient_program="/sbin/dhclient"
-dhclient_flags=""
-background_dhclient="NO"
-synchronous_dhclient="NO"
-defaultroute_delay="30"
+zfs_enable="NO"
+gbde_autoattach_all="NO"
+gbde_devices="NO"
+gbde_attach_attempts="3"
+gbde_lockdir="/etc"
+geli_devices=""
+geli_tries=""
+geli_default_flags=""
+geli_autodetach="YES"
+geli_swap_flags="-e aes -l 256 -s 4096 -d"
+root_rw_mount="YES"
+fsck_y_enable="NO"
+fsck_y_flags=""
+background_fsck="YES"
+background_fsck_delay="60"
+netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS"
+extra_netfs_types="NO"
+hostname=""
+hostid_enable="YES"
+hostid_file="/etc/hostid"
+nisdomainname="NO"
+dhclient_program="/sbin/dhclient"
+dhclient_flags=""
+background_dhclient="NO"
+synchronous_dhclient="NO"
+defaultroute_delay="30"
wpa_supplicant_program="/usr/sbin/wpa_supplicant"
-wpa_supplicant_flags="-s"
+wpa_supplicant_flags="-s"
wpa_supplicant_conf_file="/etc/wpa_supplicant.conf"
-firewall_enable="NO"
-firewall_script="/etc/rc.firewall"
-firewall_type="UNKNOWN"
-firewall_quiet="NO"
-firewall_logging="NO"
-firewall_flags=""
-firewall_client_net="192.0.2.0/24"
-firewall_simple_iif="ed1"
-firewall_simple_inet="192.0.2.16/28"
-firewall_simple_oif="ed0"
-firewall_simple_onet="192.0.2.0/28"
-firewall_myservices=""
-firewall_allowservices=""
-firewall_trusted=""
-firewall_logdeny="NO"
-firewall_nologports="135-139,445 1026,1027 1433,1434"
-firewall_nat_enable="NO"
-firewall_nat_interface=""
-firewall_nat_flags=""
-dummynet_enable="NO"
-ip_portrange_first="NO"
-ip_portrange_last="NO"
-ike_enable="NO"
-ike_program="/usr/local/sbin/isakmpd"
-ike_flags=""
-ipsec_enable="NO"
-ipsec_file="/etc/ipsec.conf"
-natd_program="/sbin/natd"
-natd_enable="NO"
-natd_interface=""
-natd_flags=""
-ipfilter_enable="NO"
-ipfilter_program="/sbin/ipf"
-ipfilter_rules="/etc/ipf.rules"
-ipfilter_flags=""
-ipnat_enable="NO"
-ipnat_program="/sbin/ipnat"
-ipnat_rules="/etc/ipnat.rules"
-ipnat_flags=""
-ipmon_enable="NO"
-ipmon_program="/sbin/ipmon"
-ipmon_flags="-Ds"
-ipfs_enable="NO"
-ipfs_program="/sbin/ipfs"
-ipfs_flags=""
-pf_enable="NO"
-pf_rules="/etc/pf.conf"
-pf_program="/sbin/pfctl"
-pf_flags=""
-pflog_enable="NO"
-pflog_logfile="/var/log/pflog"
-pflog_program="/sbin/pflogd"
-pflog_flags=""
-ftpproxy_enable="NO"
-ftpproxy_flags=""
-pfsync_enable="NO"
-pfsync_syncdev=""
-pfsync_syncpeer=""
-pfsync_ifconfig=""
-tcp_extensions="YES"
-log_in_vain="0"
-tcp_keepalive="YES"
-tcp_drop_synfin="NO"
-icmp_drop_redirect="NO"
-icmp_log_redirect="NO"
-network_interfaces="auto"
-cloned_interfaces=""
-ifconfig_lo0="inet 127.0.0.1"
-sppp_interfaces=""
-gif_interfaces=""
-fec_interfaces=""
-ppp_enable="NO"
-ppp_program="/usr/sbin/ppp"
-ppp_mode="auto"
-ppp_nat="YES"
-ppp_profile="papchap"
-ppp_user="root"
-hostapd_enable="NO"
-syslogd_enable="YES"
-syslogd_program="/usr/sbin/syslogd"
-syslogd_flags="-s"
-inetd_enable="NO"
-inetd_program="/usr/sbin/inetd"
-inetd_flags="-wW -C 60"
-named_enable="NO"
-named_program="/usr/sbin/named"
-named_conf="/etc/namedb/named.conf"
-named_pidfile="/var/run/named/pid"
-named_uid="bind"
-named_chrootdir="/var/named"
-named_chroot_autoupdate="YES"
-named_symlink_enable="YES"
-named_wait="NO"
-named_wait_host="localhost"
-named_auto_forward="NO"
-named_auto_forward_only="NO"
-kerberos5_server_enable="NO"
-kerberos5_server="/usr/libexec/kdc"
-kerberos5_server_flags="--detach"
-kadmind5_server_enable="NO"
-kadmind5_server="/usr/libexec/kadmind"
-kpasswdd_server_enable="NO"
-kpasswdd_server="/usr/libexec/kpasswdd"
-gssd_enable="NO"
-gssd_flags=""
-rwhod_enable="NO"
-rwhod_flags=""
-rarpd_enable="NO"
-rarpd_flags="-a"
-bootparamd_enable="NO"
-bootparamd_flags=""
-pppoed_enable="NO"
-pppoed_provider="*"
-pppoed_flags="-P /var/run/pppoed.pid"
-pppoed_interface="fxp0"
-sshd_enable="NO"
-sshd_program="/usr/sbin/sshd"
-sshd_flags=""
-ftpd_enable="NO"
-ftpd_program="/usr/libexec/ftpd"
-ftpd_flags=""
-amd_enable="NO"
-amd_program="/usr/sbin/amd"
+firewall_enable="NO"
+firewall_script="/etc/rc.firewall"
+firewall_type="UNKNOWN"
+firewall_quiet="NO"
+firewall_logging="NO"
+firewall_flags=""
+firewall_client_net="192.0.2.0/24"
+firewall_simple_iif="ed1"
+firewall_simple_inet="192.0.2.16/28"
+firewall_simple_oif="ed0"
+firewall_simple_onet="192.0.2.0/28"
+firewall_myservices=""
+firewall_allowservices=""
+firewall_trusted=""
+firewall_logdeny="NO"
+firewall_nologports="135-139,445 1026,1027 1433,1434"
+firewall_nat_enable="NO"
+firewall_nat_interface=""
+firewall_nat_flags=""
+dummynet_enable="NO"
+ip_portrange_first="NO"
+ip_portrange_last="NO"
+ike_enable="NO"
+ike_program="/usr/local/sbin/isakmpd"
+ike_flags=""
+ipsec_enable="NO"
+ipsec_file="/etc/ipsec.conf"
+natd_program="/sbin/natd"
+natd_enable="NO"
+natd_interface=""
+natd_flags=""
+ipfilter_enable="NO"
+ipfilter_program="/sbin/ipf"
+ipfilter_rules="/etc/ipf.rules"
+ipfilter_flags=""
+ipnat_enable="NO"
+ipnat_program="/sbin/ipnat"
+ipnat_rules="/etc/ipnat.rules"
+ipnat_flags=""
+ipmon_enable="NO"
+ipmon_program="/sbin/ipmon"
+ipmon_flags="-Ds"
+ipfs_enable="NO"
+ipfs_program="/sbin/ipfs"
+ipfs_flags=""
+pf_enable="NO"
+pf_rules="/etc/pf.conf"
+pf_program="/sbin/pfctl"
+pf_flags=""
+pflog_enable="NO"
+pflog_logfile="/var/log/pflog"
+pflog_program="/sbin/pflogd"
+pflog_flags=""
+ftpproxy_enable="NO"
+ftpproxy_flags=""
+pfsync_enable="NO"
+pfsync_syncdev=""
+pfsync_syncpeer=""
+pfsync_ifconfig=""
+tcp_extensions="YES"
+log_in_vain="0"
+tcp_keepalive="YES"
+tcp_drop_synfin="NO"
+icmp_drop_redirect="NO"
+icmp_log_redirect="NO"
+network_interfaces="auto"
+cloned_interfaces=""
+ifconfig_lo0="inet 127.0.0.1"
+sppp_interfaces=""
+gif_interfaces=""
+fec_interfaces=""
+ppp_enable="NO"
+ppp_program="/usr/sbin/ppp"
+ppp_mode="auto"
+ppp_nat="YES"
+ppp_profile="papchap"
+ppp_user="root"
+hostapd_enable="NO"
+syslogd_enable="YES"
+syslogd_program="/usr/sbin/syslogd"
+syslogd_flags="-s"
+inetd_enable="NO"
+inetd_program="/usr/sbin/inetd"
+inetd_flags="-wW -C 60"
+named_enable="NO"
+named_program="/usr/sbin/named"
+named_conf="/etc/namedb/named.conf"
+named_pidfile="/var/run/named/pid"
+named_uid="bind"
+named_chrootdir="/var/named"
+named_chroot_autoupdate="YES"
+named_symlink_enable="YES"
+named_wait="NO"
+named_wait_host="localhost"
+named_auto_forward="NO"
+named_auto_forward_only="NO"
+kerberos5_server_enable="NO"
+kerberos5_server="/usr/libexec/kdc"
+kerberos5_server_flags="--detach"
+kadmind5_server_enable="NO"
+kadmind5_server="/usr/libexec/kadmind"
+kpasswdd_server_enable="NO"
+kpasswdd_server="/usr/libexec/kpasswdd"
+gssd_enable="NO"
+gssd_flags=""
+rwhod_enable="NO"
+rwhod_flags=""
+rarpd_enable="NO"
+rarpd_flags="-a"
+bootparamd_enable="NO"
+bootparamd_flags=""
+pppoed_enable="NO"
+pppoed_provider="*"
+pppoed_flags="-P /var/run/pppoed.pid"
+pppoed_interface="fxp0"
+sshd_enable="NO"
+sshd_program="/usr/sbin/sshd"
+sshd_flags=""
+ftpd_enable="NO"
+ftpd_program="/usr/libexec/ftpd"
+ftpd_flags=""
+amd_enable="NO"
+amd_program="/usr/sbin/amd"
amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map"
-amd_map_program="NO"
-nfs_client_enable="NO"
-nfs_access_cache="60"
-nfs_server_enable="NO"
-nfs_server_flags="-u -t -n 4"
-mountd_enable="NO"
-mountd_flags="-r"
-weak_mountd_authentication="NO"
-nfs_reserved_port_only="NO"
-nfs_bufpackets=""
-rpc_lockd_enable="NO"
-rpc_lockd_flags=""
-rpc_statd_enable="NO"
-rpc_statd_flags=""
-rpcbind_enable="NO"
-rpcbind_program="/usr/sbin/rpcbind"
-rpcbind_flags=""
-rpc_ypupdated_enable="NO"
-keyserv_enable="NO"
-keyserv_flags=""
-nfsv4_server_enable="NO"
-nfscbd_enable="NO"
-nfscbd_flags=""
-nfsuserd_enable="NO"
-nfsuserd_flags=""
-timed_enable="NO"
-timed_flags=""
-ntpdate_enable="NO"
-ntpdate_program="/usr/sbin/ntpdate"
-ntpdate_flags="-b"
-ntpdate_config="/etc/ntp.conf"
-ntpdate_hosts=""
-ntpd_enable="NO"
-ntpd_program="/usr/sbin/ntpd"
-ntpd_config="/etc/ntp.conf"
-ntpd_sync_on_start="NO"
+amd_map_program="NO"
+nfs_client_enable="NO"
+nfs_access_cache="60"
+nfs_server_enable="NO"
+nfs_server_flags="-u -t -n 4"
+mountd_enable="NO"
+mountd_flags="-r"
+weak_mountd_authentication="NO"
+nfs_reserved_port_only="NO"
+nfs_bufpackets=""
+rpc_lockd_enable="NO"
+rpc_lockd_flags=""
+rpc_statd_enable="NO"
+rpc_statd_flags=""
+rpcbind_enable="NO"
+rpcbind_program="/usr/sbin/rpcbind"
+rpcbind_flags=""
+rpc_ypupdated_enable="NO"
+keyserv_enable="NO"
+keyserv_flags=""
+nfsv4_server_enable="NO"
+nfscbd_enable="NO"
+nfscbd_flags=""
+nfsuserd_enable="NO"
+nfsuserd_flags=""
+timed_enable="NO"
+timed_flags=""
+ntpdate_enable="NO"
+ntpdate_program="/usr/sbin/ntpdate"
+ntpdate_flags="-b"
+ntpdate_config="/etc/ntp.conf"
+ntpdate_hosts=""
+ntpd_enable="NO"
+ntpd_program="/usr/sbin/ntpd"
+ntpd_config="/etc/ntp.conf"
+ntpd_sync_on_start="NO"
ntpd_flags="-p /var/run/ntpd.pid -f /var/db/ntpd.drift"
-nis_client_enable="NO"
-nis_client_flags=""
-nis_ypset_enable="NO"
-nis_ypset_flags=""
-nis_server_enable="NO"
-nis_server_flags=""
-nis_ypxfrd_enable="NO"
-nis_ypxfrd_flags=""
-nis_yppasswdd_enable="NO"
-nis_yppasswdd_flags=""
-bsnmpd_enable="NO"
-bsnmpd_flags=""
-defaultrouter="NO"
-static_arp_pairs=""
-static_routes=""
-natm_static_routes=""
-gateway_enable="NO"
-routed_enable="NO"
-routed_program="/sbin/routed"
-routed_flags="-q"
-mrouted_enable="NO"
-mrouted_program="/usr/local/sbin/mrouted"
-mrouted_flags=""
-ipxgateway_enable="NO"
-ipxrouted_enable="NO"
-ipxrouted_flags=""
-arpproxy_all="NO"
-forward_sourceroute="NO"
-accept_sourceroute="NO"
-atm_enable="NO"
-atm_pvcs=""
-atm_arps=""
-hcsecd_enable="NO"
-hcsecd_config="/etc/bluetooth/hcsecd.conf"
-sdpd_enable="NO"
-sdpd_control="/var/run/sdp"
-sdpd_groupname="nobody"
-sdpd_username="nobody"
-bthidd_enable="NO"
-bthidd_config="/etc/bluetooth/bthidd.conf"
-bthidd_hids="/var/db/bthidd.hids"
-rfcomm_pppd_server_enable="NO"
-rfcomm_pppd_server_profile="one two"
-rfcomm_pppd_server_one_channel="1"
-rfcomm_pppd_server_two_channel="3"
-icmp_bmcastecho="NO"
-keyboard=""
-keymap="NO"
-keyrate="NO"
-keybell="NO"
-keychange="NO"
-cursor="NO"
-scrnmap="NO"
-font8x16="NO"
-font8x14="NO"
-font8x8="NO"
-blanktime="300"
-saver="NO"
-moused_nondefault_enable="YES"
-moused_enable="NO"
-moused_type="auto"
-moused_port="/dev/psm0"
-moused_flags=""
-mousechar_start="NO"
-allscreens_flags=""
-allscreens_kbdflags=""
+nis_client_enable="NO"
+nis_client_flags=""
+nis_ypset_enable="NO"
+nis_ypset_flags=""
+nis_server_enable="NO"
+nis_server_flags=""
+nis_ypxfrd_enable="NO"
+nis_ypxfrd_flags=""
+nis_yppasswdd_enable="NO"
+nis_yppasswdd_flags=""
+bsnmpd_enable="NO"
+bsnmpd_flags=""
+defaultrouter="NO"
+static_arp_pairs=""
+static_routes=""
+natm_static_routes=""
+gateway_enable="NO"
+routed_enable="NO"
+routed_program="/sbin/routed"
+routed_flags="-q"
+mrouted_enable="NO"
+mrouted_program="/usr/local/sbin/mrouted"
+mrouted_flags=""
+ipxgateway_enable="NO"
+ipxrouted_enable="NO"
+ipxrouted_flags=""
+arpproxy_all="NO"
+forward_sourceroute="NO"
+accept_sourceroute="NO"
+atm_enable="NO"
+atm_pvcs=""
+atm_arps=""
+hcsecd_enable="NO"
+hcsecd_config="/etc/bluetooth/hcsecd.conf"
+sdpd_enable="NO"
+sdpd_control="/var/run/sdp"
+sdpd_groupname="nobody"
+sdpd_username="nobody"
+bthidd_enable="NO"
+bthidd_config="/etc/bluetooth/bthidd.conf"
+bthidd_hids="/var/db/bthidd.hids"
+rfcomm_pppd_server_enable="NO"
+rfcomm_pppd_server_profile="one two"
+rfcomm_pppd_server_one_channel="1"
+rfcomm_pppd_server_two_channel="3"
+icmp_bmcastecho="NO"
+keyboard=""
+keymap="NO"
+keyrate="NO"
+keybell="NO"
+keychange="NO"
+cursor="NO"
+scrnmap="NO"
+font8x16="NO"
+font8x14="NO"
+font8x8="NO"
+blanktime="300"
+saver="NO"
+moused_nondefault_enable="YES"
+moused_enable="NO"
+moused_type="auto"
+moused_port="/dev/psm0"
+moused_flags=""
+mousechar_start="NO"
+allscreens_flags=""
+allscreens_kbdflags=""
mta_start_script="/etc/rc.sendmail"
-sendmail_enable="NO"
-sendmail_pidfile="/var/run/sendmail.pid"
-sendmail_procname="/usr/sbin/sendmail"
-sendmail_flags="-L sm-mta -bd -q30m"
-sendmail_submit_enable="YES"
+sendmail_enable="NO"
+sendmail_pidfile="/var/run/sendmail.pid"
+sendmail_procname="/usr/sbin/sendmail"
+sendmail_flags="-L sm-mta -bd -q30m"
+sendmail_submit_enable="YES"
sendmail_submit_flags="-L sm-mta -bd -q30m -ODaemonPortOptions=Addr=localhost"
-sendmail_outbound_enable="YES"
-sendmail_outbound_flags="-L sm-queue -q30m"
-sendmail_msp_queue_enable="YES"
+sendmail_outbound_enable="YES"
+sendmail_outbound_flags="-L sm-queue -q30m"
+sendmail_msp_queue_enable="YES"
sendmail_msp_queue_flags="-L sm-msp-queue -Ac -q30m"
-sendmail_rebuild_aliases="NO"
-auditd_enable="NO"
-auditd_program="/usr/sbin/auditd"
-auditd_flags=""
-cron_enable="YES"
-cron_program="/usr/sbin/cron"
-cron_dst="YES"
-cron_flags=""
-lpd_enable="NO"
-lpd_program="/usr/sbin/lpd"
-lpd_flags=""
-nscd_enable="NO"
-chkprintcap_enable="NO"
-chkprintcap_flags="-d"
-dumpdev="AUTO"
-dumpdir="/var/crash"
-savecore_flags=""
-crashinfo_enable="YES"
-crashinfo_program="/usr/sbin/crashinfo"
-quota_enable="NO"
-check_quotas="YES"
-quotaon_flags="-a"
-quotaoff_flags="-a"
-quotacheck_flags="-a"
-accounting_enable="NO"
-ibcs2_enable="NO"
-ibcs2_loaders="coff"
-sysvipc_enable="NO"
-linux_enable="NO"
-svr4_enable="NO"
-clear_tmp_enable="NO"
-clear_tmp_X="YES"
-ldconfig_insecure="NO"
+sendmail_rebuild_aliases="NO"
+auditd_enable="NO"
+auditd_program="/usr/sbin/auditd"
+auditd_flags=""
+cron_enable="YES"
+cron_program="/usr/sbin/cron"
+cron_dst="YES"
+cron_flags=""
+lpd_enable="NO"
+lpd_program="/usr/sbin/lpd"
+lpd_flags=""
+nscd_enable="NO"
+chkprintcap_enable="NO"
+chkprintcap_flags="-d"
+dumpdev="AUTO"
+dumpdir="/var/crash"
+savecore_flags=""
+crashinfo_enable="YES"
+crashinfo_program="/usr/sbin/crashinfo"
+quota_enable="NO"
+check_quotas="YES"
+quotaon_flags="-a"
+quotaoff_flags="-a"
+quotacheck_flags="-a"
+accounting_enable="NO"
+ibcs2_enable="NO"
+ibcs2_loaders="coff"
+sysvipc_enable="NO"
+linux_enable="NO"
+svr4_enable="NO"
+clear_tmp_enable="NO"
+clear_tmp_X="YES"
+ldconfig_insecure="NO"
ldconfig_paths="/usr/lib/compat /usr/local/lib /usr/local/lib/compat/pkg"
-ldconfig32_paths="/usr/lib32"
+ldconfig32_paths="/usr/lib32"
ldconfig_paths_aout="/usr/lib/compat/aout /usr/local/lib/aout"
ldconfig_local_dirs="/usr/local/libdata/ldconfig"
ldconfig_local32_dirs="/usr/local/libdata/ldconfig32"
-kern_securelevel_enable="NO"
-kern_securelevel="-1"
-update_motd="YES"
-entropy_file="/entropy"
-entropy_dir="/var/db/entropy"
-entropy_save_sz="2048"
-entropy_save_num="8"
-harvest_interrupt="YES"
-harvest_ethernet="YES"
-harvest_p_to_p="YES"
-dmesg_enable="YES"
-watchdogd_enable="NO"
-watchdogd_flags=""
-devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules"
-devfs_system_ruleset=""
-devfs_set_rulesets=""
-performance_cx_lowest="HIGH"
-performance_cpu_freq="NONE"
-economy_cx_lowest="HIGH"
-economy_cpu_freq="NONE"
-virecover_enable="YES"
-ugidfw_enable="NO"
-newsyslog_enable="YES"
-newsyslog_flags="-CN"
-mixer_enable="YES"
-jail_enable="NO"
-jail_list=""
-jail_set_hostname_allow="YES"
-jail_socket_unixiproute_only="YES"
-jail_sysvipc_allow="NO"
+kern_securelevel_enable="NO"
+kern_securelevel="-1"
+update_motd="YES"
+entropy_file="/entropy"
+entropy_dir="/var/db/entropy"
+entropy_save_sz="2048"
+entropy_save_num="8"
+harvest_interrupt="YES"
+harvest_ethernet="YES"
+harvest_p_to_p="YES"
+dmesg_enable="YES"
+watchdogd_enable="NO"
+watchdogd_flags=""
+devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules"
+devfs_system_ruleset=""
+devfs_set_rulesets=""
+performance_cx_lowest="HIGH"
+performance_cpu_freq="NONE"
+economy_cx_lowest="HIGH"
+economy_cpu_freq="NONE"
+virecover_enable="YES"
+ugidfw_enable="NO"
+newsyslog_enable="YES"
+newsyslog_flags="-CN"
+mixer_enable="YES"
+jail_enable="NO"
+jail_list=""
+jail_set_hostname_allow="YES"
+jail_socket_unixiproute_only="YES"
+jail_sysvipc_allow="NO"
if [ -z "${source_rc_confs_defined}" ]; then
source_rc_confs_defined=yes
source_rc_confs () {
diff -r da08f56b0dc9 -r 67a155d37199 profiles/SMALL_/files/etc/network.subr
--- a/profiles/SMALL_/files/etc/network.subr Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/SMALL_/files/etc/network.subr Mon Feb 06 13:01:03 2012 +0200
@@ -533,14 +533,14 @@
ipv4_addrs_common()
{
local _ret _if _action _cidr _cidr_addr
- local _ipaddr _netmask _range _ipnet _iplow _iphigh _ipcount
+ local _ipaddr _netmask _range _ipnet _iplow _iphigh _ipcount
_ret=1
_if=$1
_action=$2
-
+
# get ipv4-addresses
cidr_addr=`get_if_var $_if ipv4_addrs_IF`
-
+
for _cidr in ${cidr_addr}; do
_ipaddr=${_cidr%%/*}
_netmask="/"${_cidr##*/}
@@ -553,7 +553,7 @@
if [ "${_action}" = "-alias" ]; then
_netmask=""
fi
-
+
_ipcount=${_iplow}
while [ "${_ipcount}" -le "${_iphigh}" ]; do
eval "ifconfig ${_if} ${_action} ${_ipnet}.${_ipcount}${_netmask}"
diff -r da08f56b0dc9 -r 67a155d37199 profiles/SMALL_/files/etc/networks
--- a/profiles/SMALL_/files/etc/networks Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/SMALL_/files/etc/networks Mon Feb 06 13:01:03 2012 +0200
@@ -1,4 +1,4 @@
-your-net 127
-your-netmask 255.255.255
-subnet1 127.0.1 alias1
-subnet2 127.0.2 alias2
+your-net 127
+your-netmask 255.255.255
+subnet1 127.0.1 alias1
+subnet2 127.0.2 alias2
diff -r da08f56b0dc9 -r 67a155d37199 profiles/SMALL_/files/etc/rc.firewall
--- a/profiles/SMALL_/files/etc/rc.firewall Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/SMALL_/files/etc/rc.firewall Mon Feb 06 13:01:03 2012 +0200
@@ -134,12 +134,12 @@
${fwcmd} add deny { tcp or udp } from any to any $i in
done
${fwcmd} add deny ip from any to 255.255.255.255
- ${fwcmd} add deny ip from any to 224.0.0.0/24 in
+ ${fwcmd} add deny ip from any to 224.0.0.0/24 in
${fwcmd} add deny udp from any to any 520 in
${fwcmd} add deny tcp from any 80,443 to any 1024-65535 in
log=""
if [ ${firewall_logdeny:-x} = "YES" -o ${firewall_logdeny:-x} = "yes" ] ; then
- log="log logamount 500"
+ log="log logamount 500"
sysctl net.inet.ip.fw.verbose=1 >/dev/null
fi
${fwcmd} add deny $log ip from any to any
diff -r da08f56b0dc9 -r 67a155d37199 profiles/SMALL_/files/etc/rc.shutdown
--- a/profiles/SMALL_/files/etc/rc.shutdown Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/SMALL_/files/etc/rc.shutdown Mon Feb 06 13:01:03 2012 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
stty status '^T'
trap : 2
-trap : 3
+trap : 3
HOME=/
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
export HOME PATH
diff -r da08f56b0dc9 -r 67a155d37199 profiles/SMALL_/files/etc/save_etc
--- a/profiles/SMALL_/files/etc/save_etc Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/SMALL_/files/etc/save_etc Mon Feb 06 13:01:03 2012 +0200
@@ -36,7 +36,7 @@
echo "etc.tar.gz too big ${size}, must be less than ${DEVCONFIGSIZE}"
echo "Please remove big files from /etc"
exit 1
-fi
+fi
echo "Saving /etc"
sysctl hw.cfi.rdonly=0
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/dhclient-script
--- a/profiles/dlink.ua.web/files/etc/dhclient-script Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/dhclient-script Mon Feb 06 13:01:03 2012 +0200
@@ -3,8 +3,8 @@
LOG=/tmp/DHCLIENT-SCRIPT.log
touch ${LOG}
-echo "DHCLIENT-SCRIPT: $*" >> ${LOG}
-#set >> ${LOG}
+echo "DHCLIENT-SCRIPT: $*" >> ${LOG}
+#set >> ${LOG}
echo >> ${LOG}
case ${reason} in
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/mpd-linkdown
--- a/profiles/dlink.ua.web/files/etc/mpd-linkdown Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/mpd-linkdown Mon Feb 06 13:01:03 2012 +0200
@@ -3,8 +3,8 @@
LOG=/tmp/mpd-linkdown.log
touch ${LOG}
-echo "mpd-linkdown $*" >> ${LOG}
-#set >> ${LOG}
+echo "mpd-linkdown $*" >> ${LOG}
+#set >> ${LOG}
echo >> ${LOG}
interface=$1
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/mpd-linkup
--- a/profiles/dlink.ua.web/files/etc/mpd-linkup Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/mpd-linkup Mon Feb 06 13:01:03 2012 +0200
@@ -7,8 +7,8 @@
LOG=/tmp/mpd-linkup.log
touch ${LOG}
-echo "mpd-linkup $*" >> ${LOG}
-#set >> ${LOG}
+echo "mpd-linkup $*" >> ${LOG}
+#set >> ${LOG}
echo >> ${LOG}
interface=$1
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/racoon/phase1-down.sh
--- a/profiles/dlink.ua.web/files/etc/racoon/phase1-down.sh Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/racoon/phase1-down.sh Mon Feb 06 13:01:03 2012 +0200
@@ -4,7 +4,7 @@
LOG=/tmp/racoon-phase1-down.log
touch ${LOG}
-echo "phase1-down.sh $*" >> ${LOG}
+echo "phase1-down.sh $*" >> ${LOG}
echo $@ >> ${LOG}
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/racoon/phase1-up.sh
--- a/profiles/dlink.ua.web/files/etc/racoon/phase1-up.sh Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/racoon/phase1-up.sh Mon Feb 06 13:01:03 2012 +0200
@@ -4,7 +4,7 @@
LOG=/tmp/racoon-phase1-up.log
touch ${LOG}
-echo "phase1-up.sh $*" >> ${LOG}
+echo "phase1-up.sh $*" >> ${LOG}
echo $@ >> ${LOG}
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/collector.lua
--- a/profiles/dlink.ua.web/files/etc/www/collector.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/collector.lua Mon Feb 06 13:01:03 2012 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/lua
package.path = "./?.lua;/etc/www/lib/?.lua;./lib/?.lua";
-package.cpath =
+package.cpath =
"/lib/?.so;/usr/lib/?.so;/usr/lib/lua/?.so;" ..
"/lib/lua?.so;/usr/lib/lua?.so;/usr/lib/lua/lua?.so;" ..
"/lib/?-core.so;/usr/lib/?-core.so;/usr/lib/lua/?-core.so;" ..
@@ -13,7 +13,7 @@
serverhost = serverhost or "127.0.0.1";
serverport = serverport or "80";
--- Globals
+-- Globals
r = {}; -- Runtime varibles structure
rquery = {};
queue = {};
@@ -23,12 +23,12 @@
--
function urlEncode(str)
if (str) then
- str = string.gsub (str, "\n", "\r\n")
+ str = string.gsub (str, "\n", "\r\n")
str = string.gsub (str, "([^%w ])",
- function (c) return string.format ("%%%02X", string.byte(c)) end)
- str = string.gsub (str, " ", "+")
- end
- return str
+ function (c) return string.format ("%%%02X", string.byte(c)) end)
+ str = string.gsub (str, " ", "+")
+ end
+ return str
end
@@ -36,10 +36,10 @@
-- Utility function: URL decode function
--
function urlDecode(str)
- str = string.gsub (str, "+", " ")
- str = string.gsub (str, "%%(%x%x)", function(h) return string.char(tonumber(h,16)) end)
- str = string.gsub (str, "\r\n", "\n")
- return str
+ str = string.gsub (str, "+", " ")
+ str = string.gsub (str, "%%(%x%x)", function(h) return string.char(tonumber(h,16)) end)
+ str = string.gsub (str, "\r\n", "\n")
+ return str
end
-- convert name1=value1&name2=val+ue%2F2
@@ -162,7 +162,7 @@
function getopt(args, opts)
i=1;
- while i < table.getn(arg) do
+ while i < table.getn(arg) do
if arg[i]:match("^-") then
opts[arg[i]] = arg[i+1];
i = i + 1;
@@ -198,7 +198,7 @@
local control = server:accept();
if control then
- while 1 do
+ while 1 do
local data, err = control:receive();
if not err then
local q;
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/config.xml
--- a/profiles/dlink.ua.web/files/etc/www/config.xml Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/config.xml Mon Feb 06 13:01:03 2012 +0200
@@ -203,7 +203,7 @@
<user username="admin" password="admin" group="admin"></user>
<user username="user" password="123" group="stat"></user>
</users>
- <!-- host>192.168.0.1</host
+ <!-- host>192.168.0.1</host
bind to all, because we need local access also.
XXX: we should take care about ipfw deny for that. -->
<host>192.168.0.1</host>
@@ -229,7 +229,7 @@
<psk>pskpskpsk</psk>
</proposal>
</remote>
- <sainfo id="0" enable="true">
+ <sainfo id="0" enable="true">
<src>address 192.168.0.0/24 any</src>
<dst>address 192.168.2.0/24 any</dst>
<pfs_group>5</pfs_group>
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/devd.lua
--- a/profiles/dlink.ua.web/files/etc/www/devd.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/devd.lua Mon Feb 06 13:01:03 2012 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/lua
package.path = "./?.lua;/etc/www/lib/?.lua;./lib/?.lua";
-package.cpath =
+package.cpath =
"/lib/?.so;/usr/lib/?.so;/usr/lib/lua/?.so;" ..
"/lib/lua?.so;/usr/lib/lua?.so;/usr/lib/lua/lua?.so;" ..
"/lib/?-core.so;/usr/lib/?-core.so;/usr/lib/lua/?-core.so;" ..
@@ -15,12 +15,12 @@
--
function urlEncode(str)
if (str) then
- str = string.gsub (str, "\n", "\r\n")
+ str = string.gsub (str, "\n", "\r\n")
str = string.gsub (str, "([^%w ])",
- function (c) return string.format ("%%%02X", string.byte(c)) end)
- str = string.gsub (str, " ", "+")
- end
- return str
+ function (c) return string.format ("%%%02X", string.byte(c)) end)
+ str = string.gsub (str, " ", "+")
+ end
+ return str
end
@@ -28,10 +28,10 @@
-- Utility function: URL decode function
--
function urlDecode(str)
- str = string.gsub (str, "+", " ")
- str = string.gsub (str, "%%(%x%x)", function(h) return string.char(tonumber(h,16)) end)
- str = string.gsub (str, "\r\n", "\n")
- return str
+ str = string.gsub (str, "+", " ")
+ str = string.gsub (str, "%%(%x%x)", function(h) return string.char(tonumber(h,16)) end)
+ str = string.gsub (str, "\r\n", "\n")
+ return str
end
function tab_to_query(t)
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/htdocs/Administration.firmware.html
--- a/profiles/dlink.ua.web/files/etc/www/htdocs/Administration.firmware.html Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/htdocs/Administration.firmware.html Mon Feb 06 13:01:03 2012 +0200
@@ -3,7 +3,7 @@
Current Version: <strong>$$$info.firmware.version$$$</strong><br/>
Build Date:<strong>$$$info.firmware.date$$$</strong><br/>
-$$$code:conf_table("Firmware", "Firmware", "info.firmware",
+$$$code:conf_table("Firmware", "Firmware", "info.firmware",
{
{ label = "Update URL", type = "node", htmltype = "text", node = "update_url" },
})$$$
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/htdocs/Administration.info.html
--- a/profiles/dlink.ua.web/files/etc/www/htdocs/Administration.info.html Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/htdocs/Administration.info.html Mon Feb 06 13:01:03 2012 +0200
@@ -3,7 +3,7 @@
Model:<strong>$$$info.model$$$</strong><br/>
Hardware Revision:<strong>$$$info.rev$$$</strong><br/>
-$$$code:conf_table("DevInfo", "Device Information", "info",
+$$$code:conf_table("DevInfo", "Device Information", "info",
{
{ label = "Hostname", type = "node", htmltype = "text", node = "hostname" },
{ label = "Location", type = "node", htmltype = "text", node = "location" },
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/htdocs/Basic.lan.html
--- a/profiles/dlink.ua.web/files/etc/www/htdocs/Basic.lan.html Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/htdocs/Basic.lan.html Mon Feb 06 13:01:03 2012 +0200
@@ -1,7 +1,7 @@
$$$code:inc("htdocs/header.html")$$$
<h1>LAN configuration</h1>
-$$$code:conf_table("LAN", "LAN", "interfaces.bridge0",
+$$$code:conf_table("LAN", "LAN", "interfaces.bridge0",
{
{ label = "IP Address", type = "node", htmltype = "text", node = "ipaddr" },
})$$$
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/htdocs/Basic.wan.html
--- a/profiles/dlink.ua.web/files/etc/www/htdocs/Basic.wan.html Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/htdocs/Basic.wan.html Mon Feb 06 13:01:03 2012 +0200
@@ -1,7 +1,7 @@
$$$code:inc("htdocs/header.html")$$$
<h1>Internet connections configuration</h1>
-$$$code:conf_table("Static", "Ethernet Interface", "interfaces.wan0.Static",
+$$$code:conf_table("Static", "Ethernet Interface", "interfaces.wan0.Static",
{
{ label = "Enabled", type = "attr", htmltype = "checkbox", node = ":enable" },
{ label = "Automatic (DHCP)", type = "attr", htmltype = "checkbox", node = "dhcp:enable" },
@@ -12,7 +12,7 @@
{ label = "NAT Enabled", type = "attr", htmltype = "checkbox", node = "nat:enable" }
})$$$
-$$$code:conf_table("PPPoE", "PPPoE", "interfaces.wan0.PPPoE",
+$$$code:conf_table("PPPoE", "PPPoE", "interfaces.wan0.PPPoE",
{
{ label = "Enabled", type = "attr", htmltype = "checkbox", node = ":enable" },
{ label = "Username", type = "node", htmltype = "text", node = "username" },
@@ -26,7 +26,7 @@
{ label = "NAT Enabled", type = "attr", htmltype = "checkbox", node = "nat:enable" }
})$$$
-$$$code:conf_table("PPP", "PPP (3G)", "interfaces.wan0.PPP",
+$$$code:conf_table("PPP", "PPP (3G)", "interfaces.wan0.PPP",
{
{ label = "Enabled", type = "attr", htmltype = "checkbox", node = ":enable" },
{ label = "Username", type = "node", htmltype = "text", node = "username" },
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/htdocs/Basic.wlan.html
--- a/profiles/dlink.ua.web/files/etc/www/htdocs/Basic.wlan.html Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/htdocs/Basic.wlan.html Mon Feb 06 13:01:03 2012 +0200
@@ -24,7 +24,7 @@
</tr>
<tr>
<td class="">Wireless Channel :</td>
- <td>
+ <td>
<select name="channel">
<option value="1">2.412 GHz - CH 1</option>
<option value="2">2.417 GHz - CH 2</option>
@@ -43,7 +43,7 @@
<tr>
<td class="">802.11 Mode :</td>
- <td>
+ <td>
<select>
<option value="2">802.11g only</option>
<option value="3">Mixed 802.11g and 802.11b</option>
@@ -56,7 +56,7 @@
<tr>
<td class="">Channel Width :</td>
- <td>
+ <td>
<select>
<option value="0">20 MHz</option>
<option value="1">Auto 20/40 MHz</option>
@@ -65,7 +65,7 @@
</tr>
<tr>
<td class="">Transmission Rate :</td>
- <td>
+ <td>
<select>
<!-- Turbo rates in brackets. Rates are given in units of 500 kbits/s -->
<option value="0">Best (automatic)</option>
@@ -130,7 +130,7 @@
function updateSecurityMode(obj)
{
table = obj.parentNode.parentNode.parentNode;
- trs = table.getElementsByTagName('tr');
+ trs = table.getElementsByTagName('tr');
for (i = 0; i < trs.length; i ++) //>
{
tr = trs[i];
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/htdocs/Security.IPSec.html
--- a/profiles/dlink.ua.web/files/etc/www/htdocs/Security.IPSec.html Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/htdocs/Security.IPSec.html Mon Feb 06 13:01:03 2012 +0200
@@ -21,7 +21,7 @@
<dh_group>5</dh_group>
</proposal>
</remote>
- <sainfo id="0" enable="true">
+ <sainfo id="0" enable="true">
<src>address 192.168.0.0/24 any</src>
<dst>address 192.168.2.0/24 any</dst>
<pfs_group>5</pfs_group>
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/htdocs/css/router.css
--- a/profiles/dlink.ua.web/files/etc/www/htdocs/css/router.css Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/htdocs/css/router.css Mon Feb 06 13:01:03 2012 +0200
@@ -196,7 +196,7 @@
.menu li {
margin: 0px 0px 0px 0px;
- padding: 2px 2px 2px 2px;
+ padding: 2px 2px 2px 2px;
}
.menu a {
@@ -233,8 +233,8 @@
.banner{
font-family: Arial;
font-size: 12px;
- cursor:pointer;
- color: #ffffff;
+ cursor:pointer;
+ color: #ffffff;
padding: 0px 3px 0px 3px;
text-decoration: none;
}
@@ -248,18 +248,18 @@
span.word{
vertical-align: 3px;
padding: 0px 3px 0px 3px;
-}
+}
span.img{
- vertical-align: 5px;
+ vertical-align: 5px;
}
a.logout{
font-family: Arial;
- font-size: 11px;
+ font-size: 11px;
margin: 0px 0px 0px 0px;
padding: 6px 8px 6px 8px;
- width:200px;
+ width:200px;
}
a.logout:link, a.logout:visited, a.logout:active{
@@ -275,24 +275,24 @@
.list_head{
background: #4D4D4D;
- color: #FFFFFF;
+ color: #FFFFFF;
}
.div_tab {
background: #ffffff;
border-color: #c0c0c0 #ffffff #ffffff #c0c0c0;
border-style: inset;
- border-width: 2px;
+ border-width: 2px;
overflow: auto;
- height: 125px;
+ height: 125px;
}
.div_tab td{
- height: 20px;
+ height: 20px;
}
.div_tab tr{
- height: auto;
+ height: auto;
}
.div_client_tab{
@@ -300,19 +300,19 @@
border-color: #c0c0c0 #ffffff #ffffff #c0c0c0;
border-style: inset;
border-width: 1px;
- overflow: auto;
+ overflow: auto;
}
.div_client_tab td{
- height: 20px;
+ height: 20px;
}
.div_client_tab tr{
- height: auto;
+ height: auto;
}
.table_tool{
- width: 99%;
+ width: 99%;
background: #E4EAEB;
border: 1px solid #136393;
@@ -331,7 +331,7 @@
padding: 3px;
}
-.sec_n {
+.sec_n {
background-color: #EEEEEE;
color: #000000;
border-left: 1px solid #FFFFFF;
@@ -340,13 +340,13 @@
border-bottom: 1px solid #FFFFFF
}
-.sec_s {
+.sec_s {
background-color: #D4D0C8;
color: #000000;
- border-left: 1px solid #FFFFFF;
- border-top: 1px solid #FFFFFF;
- border-right: 1px solid gray;
- font-weight: bold;
+ border-left: 1px solid #FFFFFF;
+ border-top: 1px solid #FFFFFF;
+ border-right: 1px solid gray;
+ font-weight: bold;
}
.TabPane_body {
@@ -354,13 +354,13 @@
color: #000000;
border-left:1px solid #FFFFFF;
border-right: 1px solid gray;
- border-bottom: 1px solid gray;
+ border-bottom: 1px solid gray;
width:99%;
height:350px;
}
.edit_vlan_table{
-
+
background-color: #E4EAEB;
margin:20px 10px 0px 10px;
border: 1px solid #136393;
@@ -368,8 +368,8 @@
.help_title_td
{
- font-size: 14px;
+ font-size: 14px;
text-decoration: underline;
font-weight:bold;
-
+
}
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/htdocs/js/ajax.js
--- a/profiles/dlink.ua.web/files/etc/www/htdocs/js/ajax.js Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/htdocs/js/ajax.js Mon Feb 06 13:01:03 2012 +0200
@@ -2,13 +2,13 @@
function getXmlHttp()
{
var xmlhttp;
- try { xmlhttp = new ActiveXObject("Msxml2.XMLHTTP"); }
+ try { xmlhttp = new ActiveXObject("Msxml2.XMLHTTP"); }
catch (e) {
- try { xmlhttp = new ActiveXObject("Microsoft.XMLHTTP.6.0"); }
+ try { xmlhttp = new ActiveXObject("Microsoft.XMLHTTP.6.0"); }
catch (E) { }
- try { xmlhttp = new ActiveXObject("Microsoft.XMLHTTP.3.0"); }
+ try { xmlhttp = new ActiveXObject("Microsoft.XMLHTTP.3.0"); }
catch (E) { }
- try { xmlhttp = new ActiveXObject("Microsoft.XMLHTTP"); }
+ try { xmlhttp = new ActiveXObject("Microsoft.XMLHTTP"); }
catch (E) { xmlhttp = false; }
}
if (!xmlhttp && typeof XMLHttpRequest!='undefined') {
@@ -52,7 +52,7 @@
var tag = els[no].tagName.toLowerCase();
switch(tag){
- case "input":
+ case "input":
var type = els[no].type.toLowerCase();
if(!type)
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/htdocs/js/defineMyTree.js
--- a/profiles/dlink.ua.web/files/etc/www/htdocs/js/defineMyTree.js Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/htdocs/js/defineMyTree.js Mon Feb 06 13:01:03 2012 +0200
@@ -1,5 +1,5 @@
/* You can find instructions for this file here:
-/ http://www.geocities.com/marcelino_martins/ftv2instructions.html
+/ http://www.geocities.com/marcelino_martins/ftv2instructions.html
*/
// Decide if the names are links or just the icons
@@ -8,7 +8,7 @@
// Decide if the tree is to start all open or just showing the root folders
var STARTALLOPEN = 0; //replace 0 with 1 to show the whole tree
-var ICONPATH = 'img/';
+var ICONPATH = 'img/';
var deviceType="Router";
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/htdocs/js/tree.js
--- a/profiles/dlink.ua.web/files/etc/www/htdocs/js/tree.js Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/htdocs/js/tree.js Mon Feb 06 13:01:03 2012 +0200
@@ -146,17 +146,17 @@
if (this.level>0)
if (this.isLastNode)
/* the last child in the children array */
- leftSide = leftSide + "<td valign=top>" + auxEv +
- "<img name='nodeIcon" + this.id + "' id='nodeIcon" +
+ leftSide = leftSide + "<td valign=top>" + auxEv +
+ "<img name='nodeIcon" + this.id + "' id='nodeIcon" +
this.id + "' src='" + nodeName + "' height=16 border=0></span></td>";
else
- leftSide = leftSide + "<td valign=top background=" + ICONPATH + "line.gif>" + auxEv +
- "<img name='nodeIcon" + this.id + "' id='nodeIcon" +
+ leftSide = leftSide + "<td valign=top background=" + ICONPATH + "line.gif>" + auxEv +
+ "<img name='nodeIcon" + this.id + "' id='nodeIcon" +
this.id + "' src='" + nodeName + "' height=16 border=0></span></td>";
this.isRendered = 1;
- if (browserVersion == 2)
+ if (browserVersion == 2)
{
if (!doc.yPos)
doc.yPos=20;
@@ -189,13 +189,13 @@
}
else
docW = docW + auxEv + this.desc + "</span>";
-
+
docW = docW + "</td>";
docW = docW + this.blockEndHTML();
if (insertAtObj == null)
{
- if (supportsDeferral)
+ if (supportsDeferral)
{
doc.write("<div id=domRoot></div>"); /* transition between regular flow HTML, and node-insert DOM DHTML */
insertAtObj = getElById("domRoot");
@@ -253,7 +253,7 @@
if (this.getID()!=foldersTree.getID() && PERSERVESTATE && !this.isOpen) /* closing */
{
currentOpen = GetCookie("clickedFolder");
- if (currentOpen != null)
+ if (currentOpen != null)
{
currentOpen = currentOpen.replace(this.getID()+cookieCutter, "");
SetCookie("clickedFolder", currentOpen);
@@ -306,7 +306,7 @@
else
docW = docW + "<a href='" + this.hreference + "' TARGET=_top ";
- if (isTextLink)
+ if (isTextLink)
{
docW += "id=\"itemTextLink"+this.id+"\" ";
}
@@ -345,7 +345,7 @@
return se;
}
-function nodeImageSrc()
+function nodeImageSrc()
{
var srcStr = "";
if (this.isLastNode) /* the last child in the children array */
@@ -369,7 +369,7 @@
return srcStr;
}
-function iconImageSrc()
+function iconImageSrc()
{
if (this.isOpen)
return(this.iconSrc);
@@ -428,8 +428,8 @@
/*
* In Netscape, it will calling onclick function first and open new window, but it's wrong!
- * We don't really know this onclick function use for what and remove it!
- * var fullLink = "href=\""+this.link+"\" target=\""+this.target+"\"
+ * We don't really know this onclick function use for what and remove it!
+ * var fullLink = "href=\""+this.link+"\" target=\""+this.target+"\"
* onClick=\"clickOnLink('"+this.getID()+"\', '"+this.link+"','"+this.target+"');return false;\"";
*/
var fullLink = 'href=\"'+this.link+'\" target=\"'+this.target+'\"';
@@ -450,7 +450,7 @@
docW = docW + "<tr>" + leftSide + "<td valign=top>";
if (USEICONS)
- docW = docW + "<a " + fullLink + " id=\"itemIconLink"+this.id+"\">" +
+ docW = docW + "<a " + fullLink + " id=\"itemIconLink"+this.id+"\">" +
"<img id='itemIcon"+this.id+"' " + "src='"+this.iconSrc+"' border=0>" + "</a>";
else if (this.prependHTML == "")
docW = docW + "<img src=" + ICONPATH + "themespacer.gif height=2 width=3>";
@@ -478,14 +478,14 @@
insertAtObj.insertAdjacentHTML("afterEnd", docW);
}
- if (browserVersion == 2)
+ if (browserVersion == 2)
{
this.navObj = doc.layers["item"+this.id];
if (USEICONS)
this.iconImg = this.navObj.document.images["itemIcon"+this.id];
doc.yPos=doc.yPos+this.navObj.clip.height;
}
- else if (browserVersion != 0)
+ else if (browserVersion != 0)
{
this.navObj = getElById("item"+this.id);
if (USEICONS)
@@ -495,13 +495,13 @@
/*
- * Methods common to both objects (pseudo-inheritance)
+ * Methods common to both objects (pseudo-inheritance)
*/
-function forceOpeningOfAncestorFolders()
+function forceOpeningOfAncestorFolders()
{
if (this.parentObj == null || this.parentObj.isOpen)
return;
- else
+ else
{
this.parentObj.forceOpeningOfAncestorFolders();
clickOnNodeObj(this.parentObj);
@@ -510,13 +510,13 @@
function escondeBlock()
{
- if (browserVersion == 1 || browserVersion == 3)
+ if (browserVersion == 1 || browserVersion == 3)
{
if (this.navObj.style.display == "none")
return;
this.navObj.style.display = "none";
- }
- else
+ }
+ else
{
if (this.navObj.visibility == "hidden")
return;
@@ -526,7 +526,7 @@
function folderMstr(domObj)
{
- if (browserVersion == 1 || browserVersion == 3)
+ if (browserVersion == 1 || browserVersion == 3)
{
if (t==-1)
return;
@@ -540,7 +540,7 @@
this.navObj.visibility = "show";
}
-function blockStartHTML(idprefix)
+function blockStartHTML(idprefix)
{
var idParam = "id='" + idprefix + this.id + "'";
var docW = "";
@@ -555,7 +555,7 @@
return docW;
}
-function blockEndHTML()
+function blockEndHTML()
{
var docW = "";
@@ -592,7 +592,7 @@
}
-function leftSideHTML(leftSideCoded)
+function leftSideHTML(leftSideCoded)
{
var i;
var retStr = "";
@@ -613,10 +613,10 @@
function getID()
{
- /*
+ /*
* define a .xID in all nodes (folders and items) if you want to PERVESTATE that
- * work when the tree changes. The value eXternal value must be unique for each
- * node and must node change when other nodes are added or removed
+ * work when the tree changes. The value eXternal value must be unique for each
+ * node and must node change when other nodes are added or removed
* The value may be numeric or string, but cannot have the same char used in cookieCutter */
if (typeof this.xID != "undefined")
return this.xID;
@@ -630,7 +630,7 @@
{
var clicked = findObj(folderId);
- if (!clicked.isOpen)
+ if (!clicked.isOpen)
{
clickOnNodeObj(clicked);
}
@@ -638,13 +638,13 @@
if (lastOpenedFolder != null && lastOpenedFolder != folderId)
/* sets lastOpenedFolder to null */
clickOnNode(lastOpenedFolder);
- if (clicked.nChildren==0)
+ if (clicked.nChildren==0)
{
lastOpenedFolder = folderId;
clicked.isLastOpenedfolder = true;
}
- if (isLinked(clicked.hreference))
+ if (isLinked(clicked.hreference))
{
highlightObjLink(clicked);
}
@@ -687,11 +687,11 @@
}
}
-function clickOnLink(clickedId, target, windowName)
+function clickOnLink(clickedId, target, windowName)
{
highlightObjLink(findObj(clickedId));
- if (isLinked(target))
+ if (isLinked(target))
{
window.open(target,windowName);
}
@@ -710,7 +710,7 @@
var i=0;
var nodeObj;
- if (typeof foldersTree.xID != "undefined")
+ if (typeof foldersTree.xID != "undefined")
{
nodeObj = indexOfEntries[i];
for(i=0;i<nEntries&&indexOfEntries[i].xID!=id;i++)
@@ -724,7 +724,7 @@
return indexOfEntries[id];
}
-function isLinked(hrefText)
+function isLinked(hrefText)
{
var result = true;
result = (result && hrefText !=null);
@@ -735,20 +735,20 @@
}
/* Do highlighting by changing background and foreg. colors of folder or doc text */
-function highlightObjLink(nodeObj)
+function highlightObjLink(nodeObj)
{
- if (!HIGHLIGHT || nodeObj==null || nodeObj.maySelect==false)
+ if (!HIGHLIGHT || nodeObj==null || nodeObj.maySelect==false)
{
/* node deleted in DB */
return;
}
- if (browserVersion == 1 || browserVersion == 3)
+ if (browserVersion == 1 || browserVersion == 3)
{
var clickedDOMObj = getElById('itemTextLink'+nodeObj.id);
- if (clickedDOMObj != null)
+ if (clickedDOMObj != null)
{
- if (lastClicked != null)
+ if (lastClicked != null)
{
var prevClickedDOMObj = getElById('itemTextLink'+lastClicked.id);
prevClickedDOMObj.style.color=lastClickedColor;
@@ -804,7 +804,7 @@
if (targetFlag=="T")
target = "_top";
- if (optionFlags.length > 1)
+ if (optionFlags.length > 1)
{
protocolFlag = optionFlags.charAt(1);
if (protocolFlag=="h")
@@ -873,7 +873,7 @@
return parentFolder.addChild(document);
}
-function preLoadIcons()
+function preLoadIcons()
{
var auxImg;
var ICONPATH = "";
@@ -892,7 +892,7 @@
}
/* Open some folders for initial layout, if necessary */
-function setInitialLayout()
+function setInitialLayout()
{
if (browserVersion > 0 && !STARTALLOPEN)
clickOnNodeObj(foldersTree);
@@ -902,7 +902,7 @@
}
/* Used with NS4 and STARTALLOPEN */
-function renderAllTree(nodeObj, parent)
+function renderAllTree(nodeObj, parent)
{
var i=0;
nodeObj.renderOb(parent);
@@ -914,7 +914,7 @@
renderAllTree(nodeObj.children[i], null);
}
-function hideWholeTree(nodeObj, hideThisOne, nodeObjMove)
+function hideWholeTree(nodeObj, hideThisOne, nodeObjMove)
{
var i=0;
var heightContained=0;
@@ -926,10 +926,10 @@
if (browserVersion == 2)
nodeObj.navObj.moveBy(0, 0-nodeObjMove);
- for (i=0 ; i < nodeObj.nChildren; i++)
+ for (i=0 ; i < nodeObj.nChildren; i++)
{
heightContainedInChild = hideWholeTree(nodeObj.children[i], true, childrenMove)
- if (browserVersion == 2)
+ if (browserVersion == 2)
{
heightContained = heightContained + heightContainedInChild + nodeObj.children[i].navObj.clip.height;
childrenMove = childrenMove + heightContainedInChild;
@@ -939,7 +939,7 @@
return heightContained;
}
-/*
+/*
* Simulating inserAdjacentHTML on NS6
* Code by thor at jscript.dk
*/
@@ -962,7 +962,7 @@
case 'afterEnd':
if (this.nextSibling)
this.parentNode.insertBefore(parsedNode,this.nextSibling);
- else
+ else
this.parentNode.appendChild(parsedNode);
break;
}
@@ -977,7 +977,7 @@
}
}
-function getElById(idVal)
+function getElById(idVal)
{
if (document.getElementById != null)
return document.getElementById(idVal);
@@ -1012,11 +1012,11 @@
for (fldPos=0; fldPos<fldArr.length; fldPos++)
{
fldStr=fldArr[fldPos];
- if (fldStr != "")
+ if (fldStr != "")
{
nodeObj = findObj(fldStr);
if (nodeObj!=null) /* may have been deleted */
- if (nodeObj.setState)
+ if (nodeObj.setState)
{
nodeObj.forceOpeningOfAncestorFolders();
clickOnNodeObj(nodeObj);
@@ -1047,7 +1047,7 @@
}
}
-function CookieBranding(name)
+function CookieBranding(name)
{
if (typeof foldersTree.treeID != "undefined")
/* needed for multi-tree sites. make sure treeId does not contain cookieCutter; */
@@ -1065,19 +1065,19 @@
var clen = document.cookie.length;
var i = 0;
- while (i < clen)
+ while (i < clen)
{
var j = i + alen;
if (document.cookie.substring(i, j) == arg)
return getCookieVal (j);
i = document.cookie.indexOf(" ", i) + 1;
- if (i == 0)
+ if (i == 0)
break;
}
return null;
}
-function getCookieVal(offset)
+function getCookieVal(offset)
{
var endstr = document.cookie.indexOf (";", offset);
if (endstr == -1)
@@ -1146,7 +1146,7 @@
/*
* Main function
*
- * This function uses an object (navigator) defined in
+ * This function uses an object (navigator) defined in
* ua.js, imported in the main html page (left frame).
*/
function initializeDocument()
@@ -1199,7 +1199,7 @@
if (supportsDeferral && !STARTALLOPEN)
foldersTree.renderOb(null);
/* delay construction of nodes */
- else
+ else
{
renderAllTree(foldersTree, null);
@@ -1216,7 +1216,7 @@
setInitialLayout();
- if (PERSERVESTATE && GetCookie('highlightedTreeviewLink')!=null && GetCookie('highlightedTreeviewLink')!="")
+ if (PERSERVESTATE && GetCookie('highlightedTreeviewLink')!=null && GetCookie('highlightedTreeviewLink')!="")
{
var nodeObj = findObj(GetCookie('highlightedTreeviewLink'));
if (nodeObj!=null)
@@ -1237,8 +1237,8 @@
targetObj.style.cursor = "pointer";
}
-
-
+
+
function xbDetectBrowser()
{
if (window.hasOwnProperty("onerror"))
@@ -1320,8 +1320,8 @@
else
navigator.org = 'mozilla';
}
- else if ((ua.indexOf('mozilla') !=-1) && (ua.indexOf('spoofer')==-1) &&
- (ua.indexOf('compatible') == -1) && (ua.indexOf('opera')==-1) &&
+ else if ((ua.indexOf('mozilla') !=-1) && (ua.indexOf('spoofer')==-1) &&
+ (ua.indexOf('compatible') == -1) && (ua.indexOf('opera')==-1) &&
(ua.indexOf('webtv')==-1) && (ua.indexOf('hotjava')==-1))
{
var is_major = parseFloat(navigator.appVersion);
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/htdocs/js/utils.js
--- a/profiles/dlink.ua.web/files/etc/www/htdocs/js/utils.js Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/htdocs/js/utils.js Mon Feb 06 13:01:03 2012 +0200
@@ -470,7 +470,6 @@
}
*/
tmp = get_obj("table_frame").offsetHeight;
-
if(tmp > h) h = tmp;
parent.ifrMain.height = h;
}
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/htdocs/js/view.js
--- a/profiles/dlink.ua.web/files/etc/www/htdocs/js/view.js Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/htdocs/js/view.js Mon Feb 06 13:01:03 2012 +0200
@@ -23,7 +23,7 @@
function tryget(msg)
{
- ajax("POST", "/cmd.xml", msg + "&r=" + encodeURIComponent(Math.random()), true,
+ ajax("POST", "/cmd.xml", msg + "&r=" + encodeURIComponent(Math.random()), true,
function (x) {
window.alert(x.responseXML.getElementsByTagName("data")[0].firstChild.nodeValue);
}
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/htdocs/vaps.lua
--- a/profiles/dlink.ua.web/files/etc/www/htdocs/vaps.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/htdocs/vaps.lua Mon Feb 06 13:01:03 2012 +0200
@@ -14,17 +14,17 @@
</tr>
<tr>
<td class="">Visibility Status :</td>
- <td>
+ <td>
<input id="$$$iface$$$visibility" name="visibility" type="checkbox" "$$$visibility_checked$$$">
- <label for="$$$iface$$$visibility">Visible</label>
+ <label for="$$$iface$$$visibility">Visible</label>
</td>
</tr>
<!-- Only OPEN security mode now supported -->
-
+
<!--
<tr>
<td class="form_label">Security Mode :</td>
- <td>
+ <td>
<select class="security_mode" onChange="updateSecurityMode(this);">
<option value="none">None</option>
<option value="wep">WEP</option>
@@ -33,9 +33,9 @@
</select>
</td>
</tr>
- <tr class="security_mode_wpa">
+ <tr class="security_mode_wpa">
<td class="form_label">WPA Mode :</td>
- <td>
+ <td>
<select >
<option value="2">Auto (WPA or WPA2)</option>
@@ -44,14 +44,14 @@
</select>
</td>
</tr>
- <tr class="security_mode_wpa">
+ <tr class="security_mode_wpa">
<td class="form_label"><label for="$$$iface$$$wpa_rekey_time">Group Key Update Interval :</label></td>
<td><input id="$$$iface$$$wpa_rekey_time" size="10" type="text"> (seconds)</td>
</tr>
-- Same for wpa-radius --
- <tr class="security_mode_wpa-radius">
+ <tr class="security_mode_wpa-radius">
<td class="form_label">WPA Mode :</td>
- <td>
+ <td>
<select >
<option value="2">Auto (WPA or WPA2)</option>
<option value="3">WPA2 Only</option>
@@ -59,27 +59,27 @@
</select>
</td>
</tr>
- <tr class="security_mode_wpa-radius">
+ <tr class="security_mode_wpa-radius">
<td class="form_label"><label for="$$$iface$$$wpa_rekey_time">Group Key Update Interval :</label></td>
<td><input id="$$$iface$$$wpa_rekey_time" size="10" type="text"> (seconds) </td>
</tr>
- <tr class="security_mode_wpa-radius">
+ <tr class="security_mode_wpa-radius">
<td class="form_label"><label for="$$$iface$$$reauth_time">Authentication Timeout :</label></td>
<td><input id="$$$iface$$$reauth_time" size="10" type="text">(minutes)</td>
</tr>
- <tr class="security_mode_wpa-radius">
+ <tr class="security_mode_wpa-radius">
<td class="form_label"><label for="$$$iface$$$radius_server_address">RADIUS server IP Address :</label></td>
<td><input id="$$$iface$$$radius_server_address" size="20" type="text"></td>
</tr>
- <tr class="security_mode_wpa-radius">
+ <tr class="security_mode_wpa-radius">
<td class="form_label"><label for="$$$iface$$$radius_server_port">RADIUS server Port :</label></td>
<td><input id="$$$iface$$$radius_server_port" size="10" type="text"></td>
</tr>
- <tr class="security_mode_wpa-radius">
+ <tr class="security_mode_wpa-radius">
<td class="form_label"><label for="$$$iface$$$radius_shared_secret">RADIUS server Shared Secret :</label></td>
<td><input id="$$$iface$$$radius_shared_secret" size="20" maxlength="64" type="text"></td>
</tr>
- <tr class="security_mode_wpa-radius">
+ <tr class="security_mode_wpa-radius">
<td class="form_label"><label for="$$$iface$$$radius_auth_mac">MAC Address Authentication :</label></td>
<td><input id="$$$iface$$$radius_auth_mac" type="checkbox"></td>
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/httpd.lua
--- a/profiles/dlink.ua.web/files/etc/www/httpd.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/httpd.lua Mon Feb 06 13:01:03 2012 +0200
@@ -17,7 +17,7 @@
-- load the socket library
--
package.path = "./?.lua;/etc/www/lib/?.lua;./lib/?.lua";
-package.cpath =
+package.cpath =
"/lib/?.so;/usr/lib/?.so;/usr/lib/lua/?.so;" ..
"/lib/lua?.so;/usr/lib/lua?.so;/usr/lib/lua/lua?.so;" ..
"/lib/?-core.so;/usr/lib/?-core.so;/usr/lib/lua/?-core.so;" ..
@@ -54,7 +54,7 @@
--
--- A table of MIME types.
+-- A table of MIME types.
-- These values will be loaded from /etc/mime.types if available, otherwise
-- a minimum set of defaults will be used.
--
@@ -87,33 +87,33 @@
-- Print some status messages.
--
print( "\nListening upon:" );
- print( " http://" .. c:getNode("http.host"):value() .. ":" ..
+ print( " http://" .. c:getNode("http.host"):value() .. ":" ..
c:getNode("http.port"):value() .. "/" );
print( "\n\n");
--[[
table.insert(r.tasks.countdown, { count=25, task=
function()
- print("task 0 ok");
- return (true);
- end
+ print("task 0 ok");
+ return (true);
+ end
});
table.insert(r.tasks.countdown, { count=10, task=
function()
- print("task 1 ok");
- return (true);
- end
+ print("task 1 ok");
+ return (true);
+ end
});
table.insert(r.tasks.countdown, { count=15, task=
function()
- print("task 2 ok");
- return (true);
- end
+ print("task 2 ok");
+ return (true);
+ end
});
table.insert(r.tasks.countdown, { count=5, task=
function()
- print("task 3 ok");
- return (true);
- end
+ print("task 3 ok");
+ return (true);
+ end
});
]]
--
@@ -623,12 +623,12 @@
--
function urlEncode(str)
if (str) then
- str = string.gsub (str, "\n", "\r\n")
+ str = string.gsub (str, "\n", "\r\n")
str = string.gsub (str, "([^%w ])",
- function (c) return string.format ("%%%02X", string.byte(c)) end)
- str = string.gsub (str, " ", "+")
- end
- return str
+ function (c) return string.format ("%%%02X", string.byte(c)) end)
+ str = string.gsub (str, " ", "+")
+ end
+ return str
end
@@ -636,10 +636,10 @@
-- Utility function: URL decode function
--
function urlDecode(str)
- str = string.gsub (str, "+", " ")
- str = string.gsub (str, "%%(%x%x)", function(h) return string.char(tonumber(h,16)) end)
- str = string.gsub (str, "\r\n", "\n")
- return str
+ str = string.gsub (str, "+", " ")
+ str = string.gsub (str, "%%(%x%x)", function(h) return string.char(tonumber(h,16)) end)
+ str = string.gsub (str, "\r\n", "\n")
+ return str
end
@@ -692,7 +692,7 @@
--
if ( fileExists( "/etc/mime.types" ) ) then
loadMimeFile( "/etc/mime.types", mime );
-else
+else
--
-- The global MIME types file does not exist.
-- Setup minimal defaults.
@@ -920,7 +920,7 @@
function getopt(args, opts)
i=1;
- while i < table.getn(arg) do
+ while i < table.getn(arg) do
if arg[i]:match("^-") then
opts[arg[i]] = arg[i+1];
i = i + 1;
@@ -935,7 +935,7 @@
--- Globals
+-- Globals
config = {}; -- Unused now
c = {}; -- XML tree from config.xml
r = {}; -- Runtime varibles structure
@@ -1007,8 +1007,8 @@
print("Init WAN links");
os.execute("echo 'Init WAN links ...' > /dev/console");
configure_wan(c);
- return (true);
- end
+ return (true);
+ end
});
-- IPSec links tasks
table.insert(r.tasks.countdown, { count=10, task=
@@ -1016,8 +1016,8 @@
print("Run racoon");
os.execute("echo 'Run racoon ...' > /dev/console");
racoon:run();
- return (true);
- end
+ return (true);
+ end
});
print("Run server ...");
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/lib/base64.lua
--- a/profiles/dlink.ua.web/files/etc/www/lib/base64.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/lib/base64.lua Mon Feb 06 13:01:03 2012 +0200
@@ -4,7 +4,7 @@
-- encoding
function b64enc(data)
local b='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
- return ((data:gsub('.', function(x)
+ return ((data:gsub('.', function(x)
local r,b='',x:byte()
for i=8,1,-1 do r=r..(b%2^i-b%2^(i-1)>0 and '1' or '0') end
return r;
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/lib/handler.lua
--- a/profiles/dlink.ua.web/files/etc/www/lib/handler.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/lib/handler.lua Mon Feb 06 13:01:03 2012 +0200
@@ -2,17 +2,17 @@
-- Overview:
-- =========
-- Standard XML event handler(s) for XML parser module (xml.lua)
---
+--
-- Features:
-- =========
-- printHandler - Generate XML event trace
-- domHandler - Generate DOM-like node tree
-- simpleTreeHandler - Generate 'simple' node tree
---
+--
-- API:
-- ====
-- Must be called as handler function from xmlParser
--- and implement XML event callbacks (see xmlParser.lua
+-- and implement XML event callbacks (see xmlParser.lua
-- for callback API definition)
--
-- printHandler:
@@ -23,10 +23,10 @@
-- domHandler:
-- -----------
--
--- domHandler generates a DOM-like node tree structure with
--- a single ROOT node parent - each node is a table comprising
+-- domHandler generates a DOM-like node tree structure with
+-- a single ROOT node parent - each node is a table comprising
-- fields below.
---
+--
-- node = { _name = <Element Name>,
-- _type = ROOT|ELEMENT|TEXT|COMMENT|PI|DECL|DTD,
-- _attr = { Node attributes - see callback API },
@@ -39,10 +39,10 @@
-- simpleTreeHandler
-- -----------------
--
--- simpleTreeHandler is a simplified handler which attempts
+-- simpleTreeHandler is a simplified handler which attempts
-- to generate a more 'natural' table based structure which
--- supports many common XML formats.
---
+-- supports many common XML formats.
+--
-- The XML tree structure is mapped directly into a recursive
-- table structure with node names as keys and child elements
-- as either a table of values or directly as a string value
@@ -52,21 +52,21 @@
-- may be preferable to always insert elements as a vector
-- which can be specified on a per element basis in the
-- options). Attributes are inserted as a child element with
--- a key of '_attr'.
---
+-- a key of '_attr'.
+--
-- Only Tag/Text & CDATA elements are processed - all others
-- are ignored.
---
+--
-- This format has some limitations - primarily
---
--- * Mixed-Content behaves unpredictably - the relationship
--- between text elements and embedded tags is lost and
+--
+-- * Mixed-Content behaves unpredictably - the relationship
+-- between text elements and embedded tags is lost and
-- multiple levels of mixed content does not work
-- * If a leaf element has both a text element and attributes
-- then the text must be accessed through a vector (to
-- provide a container for the attribute)
--
--- In general however this format is relatively useful.
+-- In general however this format is relatively useful.
--
-- It is much easier to understand by running some test
-- data through 'textxml.lua -simpletree' than to read this)
@@ -75,16 +75,16 @@
-- =======
-- simpleTreeHandler.options.noReduce = { <tag> = bool,.. }
--
--- - Nodes not to reduce children vector even if only
+-- - Nodes not to reduce children vector even if only
-- one child
--
--- domHandler.options.(comment|pi|dtd|decl)Node = bool
---
+-- domHandler.options.(comment|pi|dtd|decl)Node = bool
+--
-- - Include/exclude given node types
---
+--
-- Usage
-- =====
--- Pased as delegate in xmlParser constructor and called
+-- Pased as delegate in xmlParser constructor and called
-- as callback by xmlParser:parse(xml) method.
--
-- See textxml.lua for examples
@@ -115,61 +115,61 @@
return t
end
for k,v in pairs(t) do
- if type(v) == 'table' then
+ if type(v) == 'table' then
v = showTable(v)
end
- res = res .. sep .. string.format("%s=%s",k,v)
+ res = res .. sep .. string.format("%s=%s",k,v)
sep = ','
end
res = '{'..res..'}'
return res
end
-
+
---Handler to generate a simple event trace
printHandler = function()
local obj = {}
- obj.starttag = function(self,t,a,s,e)
- io.write("Start : "..t.."\n")
- if a then
- for k,v in pairs(a) do
+ obj.starttag = function(self,t,a,s,e)
+ io.write("Start : "..t.."\n")
+ if a then
+ for k,v in pairs(a) do
io.write(string.format(" + %s='%s'\n",k,v))
- end
+ end
end
end
- obj.endtag = function(self,t,s,e)
- io.write("End : "..t.."\n")
+ obj.endtag = function(self,t,s,e)
+ io.write("End : "..t.."\n")
end
obj.text = function(self,t,s,e)
- io.write("Text : "..t.."\n")
+ io.write("Text : "..t.."\n")
end
obj.cdata = function(self,t,s,e)
- io.write("CDATA : "..t.."\n")
+ io.write("CDATA : "..t.."\n")
end
obj.comment = function(self,t,s,e)
- io.write("Comment : "..t.."\n")
+ io.write("Comment : "..t.."\n")
end
- obj.dtd = function(self,t,a,s,e)
- io.write("DTD : "..t.."\n")
- if a then
- for k,v in pairs(a) do
+ obj.dtd = function(self,t,a,s,e)
+ io.write("DTD : "..t.."\n")
+ if a then
+ for k,v in pairs(a) do
io.write(string.format(" + %s='%s'\n",k,v))
- end
+ end
end
end
- obj.pi = function(self,t,a,s,e)
+ obj.pi = function(self,t,a,s,e)
io.write("PI : "..t.."\n")
- if a then
- for k,v in pairs(a) do
+ if a then
+ for k,v in pairs(a) do
io. write(string.format(" + %s='%s'\n",k,v))
- end
+ end
end
end
- obj.decl = function(self,t,a,s,e)
+ obj.decl = function(self,t,a,s,e)
io.write("XML Decl : "..t.."\n")
- if a then
- for k,v in pairs(a) do
+ if a then
+ for k,v in pairs(a) do
io.write(string.format(" + %s='%s'\n",k,v))
- end
+ end
end
end
return obj
@@ -178,8 +178,8 @@
---Handler to generate a lua table from a XML content string
function simpleTreeHandler()
local obj = {}
-
- obj.root = {}
+
+ obj.root = {}
obj.stack = {obj.root;n=1}
obj.options = {noreduce = {}}
@@ -191,20 +191,20 @@
self:reduce(v,k,node)
end
end
- if table.getn(node) == 1 and not self.options.noreduce[key] and
+ if table.getn(node) == 1 and not self.options.noreduce[key] and
node._attr == nil then
parent[key] = node[1]
else
node.n = nil
end
end
-
+
obj.starttag = function(self,t,a)
local node = {}
if self.parseAttributes == true then
node._attr=a
end
-
+
local current = self.stack[table.getn(self.stack)]
if current[t] then
table.insert(current[t],node)
@@ -226,7 +226,7 @@
end
table.remove(self.stack)
end
-
+
obj.text = function(self,t)
local current = self.stack[table.getn(self.stack)]
table.insert(current,t)
@@ -238,16 +238,16 @@
end
--- domHandler
-function domHandler()
+function domHandler()
local obj = {}
obj.options = {commentNode=1,piNode=1,dtdNode=1,declNode=1}
obj.root = { _children = {n=0}, _type = "ROOT" }
obj.current = obj.root
obj.starttag = function(self,t,a)
- local node = { _type = 'ELEMENT',
- _name = t,
- _attr = a,
- _parent = self.current,
+ local node = { _type = 'ELEMENT',
+ _name = t,
+ _attr = a,
+ _parent = self.current,
_children = {n=0} }
table.insert(self.current._children,node)
self.current = node
@@ -259,42 +259,42 @@
self.current = self.current._parent
end
obj.text = function(self,t)
- local node = { _type = "TEXT",
- _parent = self.current,
+ local node = { _type = "TEXT",
+ _parent = self.current,
_text = t }
table.insert(self.current._children,node)
end
obj.comment = function(self,t)
if self.options.commentNode then
- local node = { _type = "COMMENT",
- _parent = self.current,
+ local node = { _type = "COMMENT",
+ _parent = self.current,
_text = t }
table.insert(self.current._children,node)
end
end
obj.pi = function(self,t,a)
if self.options.piNode then
- local node = { _type = "PI",
+ local node = { _type = "PI",
_name = t,
- _attr = a,
- _parent = self.current }
+ _attr = a,
+ _parent = self.current }
table.insert(self.current._children,node)
end
end
obj.decl = function(self,t,a)
if self.options.declNode then
- local node = { _type = "DECL",
+ local node = { _type = "DECL",
_name = t,
- _attr = a,
+ _attr = a,
_parent = self.current }
table.insert(self.current._children,node)
end
end
obj.dtd = function(self,t,a)
if self.options.dtdNode then
- local node = { _type = "DTD",
+ local node = { _type = "DTD",
_name = t,
- _attr = a,
+ _attr = a,
_parent = self.current }
table.insert(self.current._children,node)
end
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/lib/ipcalc.lua
--- a/profiles/dlink.ua.web/files/etc/www/lib/ipcalc.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/lib/ipcalc.lua Mon Feb 06 13:01:03 2012 +0200
@@ -37,7 +37,7 @@
if r.bits then
r.ip = toint(i1, i2, i3, i4);
else
- local i1, i2, i3, i4, m1, m2, m3, m4 = string.match(cidr,
+ local i1, i2, i3, i4, m1, m2, m3, m4 = string.match(cidr,
"^(%d+)%.(%d+)%.(%d+)%.(%d+)%/(%d+)%.(%d+)%.(%d+)%.(%d+)$");
if m4 then
r.ip = toint(i1, i2, i3, i4);
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/lib/mime.lua
--- a/profiles/dlink.ua.web/files/etc/www/lib/mime.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/lib/mime.lua Mon Feb 06 13:01:03 2012 +0200
@@ -27,7 +27,7 @@
name, opt1, opt2 = "default", name, opt1
end
local f = table[name or "nil"]
- if not f then
+ if not f then
base.error("unknown key (" .. base.tostring(name) .. ")", 3)
else return f(opt1, opt2) end
end
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/lib/mpd.lua
--- a/profiles/dlink.ua.web/files/etc/www/lib/mpd.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/lib/mpd.lua Mon Feb 06 13:01:03 2012 +0200
@@ -125,7 +125,7 @@
-- TODO
-- local ip = c:getNode(path .. "." .. "ipaddr")
--- if ip then
+-- if ip then
-- string.match(ip:value(), "%d+%.%d+%.%d+%.%d+%/(%d+)")
-- end
@@ -202,7 +202,7 @@
self:msg("set pppoe iface " .. self.c:getNode(path .. "." .. "interface"):value() .. "");
self:msg("set pppoe service \"" .. self.c:getNode(path .. "." .. "service"):value() .. "\"");
elseif mpdtype == "pptp" then
- -- TODO:
+ -- TODO:
self:msg("set pptp self 10.1.3.3");
self:msg("set pptp peer 10.1.0.1");
self:msg("set pptp disable windowing");
@@ -252,7 +252,7 @@
--[[
Bundle 'PPP' (static):
- Links : PPP[Opened/UP]
+ Links : PPP[Opened/UP]
Status : OPEN
Session time : 1119 seconds
MultiSession Id: 249-PPP
@@ -267,7 +267,7 @@
High mark : 80%
Min conn : 30 seconds
Min disc : 90 seconds
- Links :
+ Links :
Bundle level options:
ipcp enable
ipv6cp disable
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/lib/node.lua
--- a/profiles/dlink.ua.web/files/etc/www/lib/node.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/lib/node.lua Mon Feb 06 13:01:03 2012 +0200
@@ -39,7 +39,7 @@
end
function Node:value(_value)
- if self.node._children and
+ if self.node._children and
self.node._children[1] and
self.node._children[1]._text then
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/lib/racoon.lua
--- a/profiles/dlink.ua.web/files/etc/www/lib/racoon.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/lib/racoon.lua Mon Feb 06 13:01:03 2012 +0200
@@ -59,10 +59,10 @@
hash_algorithm md5;
authentication_method pre_shared_key;
dh_group 5;
- }
-}
+ }
+}
sainfo (address 192.168.0.0/24 any address 192.168.2.0/24 any)
-{
+{
pfs_group 5;
lifetime time 3600 sec;
encryption_algorithm 3des;
@@ -104,7 +104,7 @@
<psk>pskpskpsk</psk>
</proposal>
</remote>
- <sainfo id="0" enable="true">
+ <sainfo id="0" enable="true">
<src>address 192.168.0.0/24 any</src>
<dst>address 192.168.2.0/24 any</dst>
<pfs_group>5</pfs_group>
@@ -223,7 +223,7 @@
conf = conf .. "}\n";
print("IPsec Remote config file " .. file .. ":\n" ..
- conf ..
+ conf ..
"=======================================\n");
local f = assert(io.open(file, "w"));
@@ -258,7 +258,7 @@
conf = conf .. "}\n";
print("IPsec SA info config file " .. file .. ":\n" ..
- conf ..
+ conf ..
"=======================================\n");
local f = assert(io.open(file, "w"));
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/lib/socket/http.lua
--- a/profiles/dlink.ua.web/files/etc/www/lib/socket/http.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/lib/socket/http.lua Mon Feb 06 13:01:03 2012 +0200
@@ -215,7 +215,7 @@
}
-- if we have authentication information, pass it along
if reqt.user and reqt.password then
- lower["authorization"] =
+ lower["authorization"] =
"Basic " .. (mime.b64(reqt.user .. ":" .. reqt.password))
end
-- override with user headers
@@ -239,7 +239,7 @@
-- explicit components override url
for i,v in base.pairs(reqt) do nreqt[i] = v end
if nreqt.port == "" then nreqt.port = 80 end
- socket.try(nreqt.host and nreqt.host ~= "",
+ socket.try(nreqt.host and nreqt.host ~= "",
"invalid host '" .. base.tostring(nreqt.host) .. "'")
-- compute uri if user hasn't overriden
nreqt.uri = reqt.uri or adjusturi(nreqt)
@@ -277,10 +277,10 @@
source = reqt.source,
sink = reqt.sink,
headers = reqt.headers,
- proxy = reqt.proxy,
+ proxy = reqt.proxy,
nredirects = (reqt.nredirects or 0) + 1,
create = reqt.create
- }
+ }
-- pass location header back as a hint we redirected
headers = headers or {}
headers.location = headers.location or location
@@ -297,7 +297,7 @@
h:sendheaders(nreqt.headers)
-- if there is a body, send it
if nreqt.source then
- h:sendbody(nreqt.headers, nreqt.source, nreqt.step)
+ h:sendbody(nreqt.headers, nreqt.source, nreqt.step)
end
local code, status = h:receivestatusline()
-- if it is an HTTP/0.9 server, simply get the body and we are done
@@ -307,13 +307,13 @@
end
local headers
-- ignore any 100-continue messages
- while code == 100 do
+ while code == 100 do
headers = h:receiveheaders()
code, status = h:receivestatusline()
end
headers = h:receiveheaders()
-- at this point we should have a honest reply from the server
- -- we can't redirect if we already used the source, so we report the error
+ -- we can't redirect if we already used the source, so we report the error
if shouldredirect(nreqt, code, headers) and not nreqt.source then
h:close()
return tredirect(reqt, headers.location)
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/lib/socket/url.lua
--- a/profiles/dlink.ua.web/files/etc/www/lib/socket/url.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/lib/socket/url.lua Mon Feb 06 13:01:03 2012 +0200
@@ -233,7 +233,7 @@
relative_parsed.query = base_parsed.query
end
end
- else
+ else
relative_parsed.path = absolute_path(base_parsed.path or "",
relative_parsed.path)
end
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/lib/utils.lua
--- a/profiles/dlink.ua.web/files/etc/www/lib/utils.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/lib/utils.lua Mon Feb 06 13:01:03 2012 +0200
@@ -110,7 +110,7 @@
local f, e = io.open(_file, "r")
if f then
xml = f:read("*a")
- else
+ else
return ("Can't open file " .. _file);
end
@@ -137,7 +137,7 @@
if out then
out:write(_data);
assert(out:close());
- else
+ else
print(e);
return (nil);
end
@@ -161,7 +161,7 @@
function conf_table(id, header, rootpath, fields)
- local ret =
+ local ret =
"<div id=\"" .. id .. "\" class=\"yui3-module boxitem\">\n" ..
" <div class=\"yui3-hd\">\n" ..
" <h4>" .. header .."</h4>\n" ..
diff -r da08f56b0dc9 -r 67a155d37199 profiles/dlink.ua.web/files/etc/www/lib/xml.lua
--- a/profiles/dlink.ua.web/files/etc/www/lib/xml.lua Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/dlink.ua.web/files/etc/www/lib/xml.lua Mon Feb 06 13:01:03 2012 +0200
@@ -2,11 +2,11 @@
-- Overview:
-- =========
--
--- This module provides a non-validating XML stream parser in Lua.
---
+-- This module provides a non-validating XML stream parser in Lua.
+--
-- Features:
-- =========
---
+--
-- * Tokenises well-formed XML (relatively robustly)
-- * Flexible handler based event api (see below)
-- * Parses all XML Infoset elements - ie.
@@ -17,33 +17,33 @@
-- - XML Decl
-- - Processing Instructions
-- - DOCTYPE declarations
--- * Provides limited well-formedness checking
+-- * Provides limited well-formedness checking
-- (checks for basic syntax & balanced tags only)
-- * Flexible whitespace handling (selectable)
-- * Entity Handling (selectable)
---
+--
-- Limitations:
-- ============
---
+--
-- * Non-validating
--- * No charset handling
--- * No namespace support
+-- * No charset handling
+-- * No namespace support
-- * Shallow well-formedness checking only (fails
-- to detect most semantic errors)
---
+--
-- API:
-- ====
--
--- The parser provides a partially object-oriented API with
+-- The parser provides a partially object-oriented API with
-- functionality split into tokeniser and hanlder components.
---
+--
-- The handler instance is passed to the tokeniser and receives
-- callbacks for each XML element processed (if a suitable handler
--- function is defined). The API is conceptually similar to the
+-- function is defined). The API is conceptually similar to the
-- SAX API but implemented differently.
---
+--
-- The following events are generated by the tokeniser
---
+--
-- handler:start - Start Tag
-- handler:end - End Tag
-- handler:text - Text
@@ -51,15 +51,15 @@
-- handler:pi - Processing Instruction
-- handler:comment - Comment
-- handler:dtd - DOCTYPE definition
--- handler:cdata - CDATA
---
+-- handler:cdata - CDATA
+--
-- The function prototype for all the callback functions is
---
+--
-- callback(val,attrs,start,end)
---
--- where attrs is a table and val/attrs are overloaded for
+--
+-- where attrs is a table and val/attrs are overloaded for
-- specific callbacks - ie.
---
+--
-- Callback val attrs (table)
-- -------- --- -------------
-- start name { attributes (name=val).. }
@@ -70,7 +70,7 @@
-- pi pi name { attributes (if present)..
-- _text = <PI Text>
-- }
--- comment <text> nil
+-- comment <text> nil
-- dtd root element { _root = <Root Element>,
-- _type = SYSTEM|PUBLIC,
-- _name = <name>,
@@ -89,48 +89,48 @@
--
-- Parser options are controlled through the 'self.options' table.
-- Available options are -
---
--- * stripWS
---
--- Strip non-significant whitespace (leading/trailing)
+--
+-- * stripWS
+--
+-- Strip non-significant whitespace (leading/trailing)
-- and do not generate events for empty text elements
---
--- * expandEntities
---
--- Expand entities (standard entities + single char
--- numeric entities only currently - could be extended
+--
+-- * expandEntities
+--
+-- Expand entities (standard entities + single char
+-- numeric entities only currently - could be extended
-- at runtime if suitable DTD parser added elements
-- to table (see obj._ENTITIES). May also be possible
-- to expand multibyre entities for UTF-8 only
---
+--
-- * errorHandler
---
--- Custom error handler function
+--
+-- Custom error handler function
--
-- NOTE: Boolean options must be set to 'nil' not '0'
---
+--
-- Usage
-- =====
--
--- Create a handler instance -
---
+-- Create a handler instance -
+--
-- h = { start = function(t,a,s,e) .... end,
-- end = function(t,a,s,e) .... end,
-- text = function(t,a,s,e) .... end,
-- cdata = text }
---
+--
-- (or use predefined handler - see handler.lua)
---
--- Create parser instance -
---
+--
+-- Create parser instance -
+--
-- p = xmlParser(h)
---
+--
-- Set options -
--
-- p.options.xxxx = nil
--
-- Parse XML data -
---
+--
-- xmlParser:parse("<?xml... ")
-- License:
-- ========
@@ -156,14 +156,14 @@
---Parses a XML string
-- at param handler Handler object to be used to convert the XML string
--to another formats. @see handler.lua
-xmlParser = function(handler)
+xmlParser = function(handler)
local obj = {}
- -- Public attributes
+ -- Public attributes
- obj.options = {
- stripWS = 1,
+ obj.options = {
+ stripWS = 1,
expandEntities = 1,
- errorHandler = function(err,pos)
+ errorHandler = function(err,pos)
error(format("%s [char=%d]\n",
err or "Parse Error",pos))
end,
@@ -176,26 +176,26 @@
parseAttributes = true
end
self._handler.parseAttributes = parseAttributes
-
+
local match,endmatch,pos = 0,0,1
local text,endt1,endt2,tagstr,tagname,attrs,starttext,endtext
local errstart,errend,extstart,extend
while match do
-- Get next tag (first pass - fix exceptions below)
- match,endmatch,text,endt1,tagstr,endt2 = string.find(str,self._XML,pos)
- if not match then
+ match,endmatch,text,endt1,tagstr,endt2 = string.find(str,self._XML,pos)
+ if not match then
if string.find(str,self._WS,pos) then
-- No more text - check document complete
if table.getn(self._stack) ~= 0 then
self:_err(self._errstr.incompleteXmlErr,pos)
else
- break
+ break
end
else
-- Unparsable text
self:_err(self._errstr.xmlErr,pos)
end
- end
+ end
-- Handle leading text
starttext = match
endtext = match + string.len(text) - 1
@@ -208,31 +208,31 @@
if string.find(string.sub(tagstr,1,5),"?xml%s") then
-- XML Declaration
match,endmatch,text = string.find(str,self._PI,pos)
- if not match then
+ if not match then
self:_err(self._errstr.declErr,pos)
- end
+ end
if match ~= 1 then
-- Must be at start of doc if present
self:_err(self._errstr.declStartErr,pos)
end
- tagname,attrs = self:_parseTag(text)
+ tagname,attrs = self:_parseTag(text)
-- TODO: Check attributes are valid
-- Check for version (mandatory)
if attrs.version == nil then
self:_err(self._errstr.declAttrErr,pos)
end
- if self._handler.decl then
- self._handler:decl(tagname,attrs,match,endmatch)
+ if self._handler.decl then
+ self._handler:decl(tagname,attrs,match,endmatch)
end
elseif string.sub(tagstr,1,1) == "?" then
-- Processing Instruction
match,endmatch,text = string.find(str,self._PI,pos)
- if not match then
+ if not match then
self:_err(self._errstr.piErr,pos)
- end
- if self._handler.pi then
+ end
+ if self._handler.pi then
-- Parse PI attributes & text
- tagname,attrs = self:_parseTag(text)
+ tagname,attrs = self:_parseTag(text)
local pi = string.sub(text,string.len(tagname)+1)
if pi ~= "" then
if attrs then
@@ -241,33 +241,33 @@
attrs = { _text = pi }
end
end
- self._handler:pi(tagname,attrs,match,endmatch)
+ self._handler:pi(tagname,attrs,match,endmatch)
end
elseif string.sub(tagstr,1,3) == "!--" then
-- Comment
match,endmatch,text = string.find(str,self._COMMENT,pos)
- if not match then
+ if not match then
self:_err(self._errstr.commentErr,pos)
- end
- if self._handler.comment then
+ end
+ if self._handler.comment then
text = self:_parseEntities(self:_stripWS(text))
self._handler:comment(text,next,match,endmatch)
end
elseif string.sub(tagstr,1,8) == "!DOCTYPE" then
-- DTD
match,endmatch,attrs = self:_parseDTD(string,pos)
- if not match then
+ if not match then
self:_err(self._errstr.dtdErr,pos)
- end
+ end
if self._handler.dtd then
self._handler:dtd(attrs._root,attrs,match,endmatch)
end
elseif string.sub(tagstr,1,8) == "![CDATA[" then
-- CDATA
match,endmatch,text = string.find(str,self._CDATA,pos)
- if not match then
+ if not match then
self:_err(self._errstr.cdataErr,pos)
- end
+ end
if self._handler.cdata then
self._handler:cdata(text,nil,match,endmatch)
end
@@ -275,7 +275,7 @@
-- Normal tag
-- Need theck for embedded '>' in attribute value and extend
- -- match recursively if necessary eg. <tag attr="123>456">
+ -- match recursively if necessary eg. <tag attr="123>456">
while 1 do
errstart,errend = string.find(tagstr,self._ATTRERR1)
@@ -287,15 +287,15 @@
end
extstart,extend,endt2 = string.find(str,self._TAGEXT,endmatch+1)
tagstr = tagstr .. string.sub(string,endmatch,extend-1)
- if not match then
+ if not match then
self:_err(self._errstr.xmlErr,pos)
- end
+ end
endmatch = extend
- end
+ end
-- Extract tagname/attrs
-
- tagname,attrs = self:_parseTag(tagstr)
+
+ tagname,attrs = self:_parseTag(tagstr)
if (endt1=="/") then
-- End tag
@@ -364,18 +364,18 @@
["&"] = "&",
["""] = '"',
["'"] = "'",
- ["&#(%d+);"] = function (x)
+ ["&#(%d+);"] = function (x)
local d = tonumber(x)
if d >= 0 and d < 256 then
- return string.char(d)
+ return string.char(d)
else
return "&#"..d..";"
end
end,
- ["&#x(%x+);"] = function (x)
+ ["&#x(%x+);"] = function (x)
local d = tonumber(x,16)
if d >= 0 and d < 256 then
- return string.char(d)
+ return string.char(d)
else
return "&#x"..x..";"
end
@@ -387,7 +387,7 @@
self.options.errorHandler(err,pos)
end
end
-
+
obj._errstr = { xmlErr = "Error Parsing XML",
declErr = "Error Parsing XMLDecl",
declStartErr = "XMLDecl not at start of document",
@@ -409,62 +409,62 @@
return s
end
- obj._parseEntities = function(self,s)
+ obj._parseEntities = function(self,s)
if self.options.expandEntities then
--for k,v in self._ENTITIES do
for k,v in pairs(self._ENTITIES) do
- --print (k, v)
+ --print (k, v)
s = string.gsub(s,k,v)
end
end
return s
end
-
+
obj._parseDTD = function(self,s,pos)
-- match,endmatch,root,type,name,uri,internal
local m,e,r,t,n,u,i
m,e,r,t,u,i = string.find(s,self._DTD1,pos)
if m then
- return m,e,{_root=r,_type=t,_uri=u,_internal=i}
+ return m,e,{_root=r,_type=t,_uri=u,_internal=i}
end
m,e,r,t,n,u,i = string.find(s,self._DTD2,pos)
if m then
- return m,e,{_root=r,_type=t,_name=n,_uri=u,_internal=i}
+ return m,e,{_root=r,_type=t,_name=n,_uri=u,_internal=i}
end
m,e,r,i = string.find(s,self._DTD3,pos)
if m then
- return m,e,{_root=r,_internal=i}
+ return m,e,{_root=r,_internal=i}
end
m,e,r,t,u = string.find(s,self._DTD4,pos)
if m then
- return m,e,{_root=r,_type=t,_uri=u}
+ return m,e,{_root=r,_type=t,_uri=u}
end
m,e,r,t,n,u = string.find(s,self._DTD5,pos)
if m then
- return m,e,{_root=r,_type=t,_name=n,_uri=u}
+ return m,e,{_root=r,_type=t,_name=n,_uri=u}
end
return nil
end
obj._parseTag = function(self,s)
- local attrs = {}
+ local attrs = {}
local tagname = string.gsub(s,self._TAG,'%1')
- string.gsub(s,self._ATTR1,function (k,v)
+ string.gsub(s,self._ATTR1,function (k,v)
attrs[string.lower(k)]=self:_parseEntities(v)
- attrs._ = 1
- end)
- string.gsub(s,self._ATTR2,function (k,v)
+ attrs._ = 1
+ end)
+ string.gsub(s,self._ATTR2,function (k,v)
attrs[string.lower(k)]=self:_parseEntities(v)
- attrs._ = 1
- end)
+ attrs._ = 1
+ end)
if attrs._ then
attrs._ = nil
- else
+ else
attrs = nil
end
return tagname,attrs
end
-
+
return obj
end
diff -r da08f56b0dc9 -r 67a155d37199 profiles/xSMALL_/files/etc/bin/update
--- a/profiles/xSMALL_/files/etc/bin/update Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/xSMALL_/files/etc/bin/update Mon Feb 06 13:01:03 2012 +0200
@@ -66,7 +66,7 @@
if [ "x${fwURL}" != "x" ]; then
echo "Updating system image to type ${UPDATE_TYPE}, version ${fwExternal}.${fwInternal}"
fetch -o /tmp/fw.img "${fwURL}" || exit 1
- upgrade -f /tmp/fw.img
+ upgrade -f /tmp/fw.img
fi
diff -r da08f56b0dc9 -r 67a155d37199 profiles/xSMALL_/files/etc/defaults/rc.conf
--- a/profiles/xSMALL_/files/etc/defaults/rc.conf Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/xSMALL_/files/etc/defaults/rc.conf Mon Feb 06 13:01:03 2012 +0200
@@ -1,369 +1,369 @@
-rc_debug="NO"
-rc_info="NO"
-rc_startmsgs="YES"
-rcshutdown_timeout="30"
-early_late_divider="FILESYSTEMS"
-swapfile="NO"
-apm_enable="NO"
-apmd_enable="NO"
-apmd_flags=""
-ddb_enable="NO"
-ddb_config="/etc/ddb.conf"
-cdevd_enable="YES"
-cdevd_flags=""
+rc_debug="NO"
+rc_info="NO"
+rc_startmsgs="YES"
+rcshutdown_timeout="30"
+early_late_divider="FILESYSTEMS"
+swapfile="NO"
+apm_enable="NO"
+apmd_enable="NO"
+apmd_flags=""
+ddb_enable="NO"
+ddb_config="/etc/ddb.conf"
+cdevd_enable="YES"
+cdevd_flags=""
buttons_pins=""
buttons_gpioc_dev="/dev/gpioc0"
-kldxref_enable="NO"
-kldxref_clobber="NO"
-kldxref_module_path=""
-powerd_enable="NO"
-powerd_flags=""
-tmpmfs="AUTO"
-tmpsize="20m"
-tmpmfs_flags="-S"
-varmfs="AUTO"
-varsize="32m"
-varmfs_flags="-S"
-populate_var="AUTO"
-cleanvar_enable="YES"
-local_startup="/usr/local/etc/rc.d"
-script_name_sep=" "
+kldxref_enable="NO"
+kldxref_clobber="NO"
+kldxref_module_path=""
+powerd_enable="NO"
+powerd_flags=""
+tmpmfs="AUTO"
+tmpsize="20m"
+tmpmfs_flags="-S"
+varmfs="AUTO"
+varsize="32m"
+varmfs_flags="-S"
+populate_var="AUTO"
+cleanvar_enable="YES"
+local_startup="/usr/local/etc/rc.d"
+script_name_sep=" "
rc_conf_files="/etc/rc.conf /etc/rc.conf.local"
-zfs_enable="NO"
-gbde_autoattach_all="NO"
-gbde_devices="NO"
-gbde_attach_attempts="3"
-gbde_lockdir="/etc"
-geli_devices=""
-geli_tries=""
-geli_default_flags=""
-geli_autodetach="YES"
-geli_swap_flags="-e aes -l 256 -s 4096 -d"
-root_rw_mount="YES"
-fsck_y_enable="NO"
-fsck_y_flags=""
-background_fsck="YES"
-background_fsck_delay="60"
-netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS"
-extra_netfs_types="NO"
-hostname=""
-hostid_enable="YES"
-hostid_file="/etc/hostid"
-nisdomainname="NO"
-dhclient_program="/sbin/dhclient"
-dhclient_flags=""
-background_dhclient="NO"
-synchronous_dhclient="NO"
-defaultroute_delay="30"
+zfs_enable="NO"
+gbde_autoattach_all="NO"
+gbde_devices="NO"
+gbde_attach_attempts="3"
+gbde_lockdir="/etc"
+geli_devices=""
+geli_tries=""
+geli_default_flags=""
+geli_autodetach="YES"
+geli_swap_flags="-e aes -l 256 -s 4096 -d"
+root_rw_mount="YES"
+fsck_y_enable="NO"
+fsck_y_flags=""
+background_fsck="YES"
+background_fsck_delay="60"
+netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS"
+extra_netfs_types="NO"
+hostname=""
+hostid_enable="YES"
+hostid_file="/etc/hostid"
+nisdomainname="NO"
+dhclient_program="/sbin/dhclient"
+dhclient_flags=""
+background_dhclient="NO"
+synchronous_dhclient="NO"
+defaultroute_delay="30"
wpa_supplicant_program="/usr/sbin/wpa_supplicant"
-wpa_supplicant_flags="-s"
+wpa_supplicant_flags="-s"
wpa_supplicant_conf_file="/etc/wpa_supplicant.conf"
-firewall_enable="NO"
-firewall_script="/etc/rc.firewall"
-firewall_type="UNKNOWN"
-firewall_quiet="NO"
-firewall_logging="NO"
-firewall_flags=""
-firewall_client_net="192.0.2.0/24"
-firewall_simple_iif="ed1"
-firewall_simple_inet="192.0.2.16/28"
-firewall_simple_oif="ed0"
-firewall_simple_onet="192.0.2.0/28"
-firewall_myservices=""
-firewall_allowservices=""
-firewall_trusted=""
-firewall_logdeny="NO"
-firewall_nologports="135-139,445 1026,1027 1433,1434"
-firewall_nat_enable="NO"
-firewall_nat_interface=""
-firewall_nat_flags=""
-dummynet_enable="NO"
-ip_portrange_first="NO"
-ip_portrange_last="NO"
-ike_enable="NO"
-ike_program="/usr/local/sbin/isakmpd"
-ike_flags=""
-ipsec_enable="NO"
-ipsec_file="/etc/ipsec.conf"
-natd_program="/sbin/natd"
-natd_enable="NO"
-natd_interface=""
-natd_flags=""
-ipfilter_enable="NO"
-ipfilter_program="/sbin/ipf"
-ipfilter_rules="/etc/ipf.rules"
-ipfilter_flags=""
-ipnat_enable="NO"
-ipnat_program="/sbin/ipnat"
-ipnat_rules="/etc/ipnat.rules"
-ipnat_flags=""
-ipmon_enable="NO"
-ipmon_program="/sbin/ipmon"
-ipmon_flags="-Ds"
-ipfs_enable="NO"
-ipfs_program="/sbin/ipfs"
-ipfs_flags=""
-pf_enable="NO"
-pf_rules="/etc/pf.conf"
-pf_program="/sbin/pfctl"
-pf_flags=""
-pflog_enable="NO"
-pflog_logfile="/var/log/pflog"
-pflog_program="/sbin/pflogd"
-pflog_flags=""
-ftpproxy_enable="NO"
-ftpproxy_flags=""
-pfsync_enable="NO"
-pfsync_syncdev=""
-pfsync_syncpeer=""
-pfsync_ifconfig=""
-tcp_extensions="YES"
-log_in_vain="0"
-tcp_keepalive="YES"
-tcp_drop_synfin="NO"
-icmp_drop_redirect="NO"
-icmp_log_redirect="NO"
-network_interfaces="auto"
-cloned_interfaces=""
-ifconfig_lo0="inet 127.0.0.1"
-sppp_interfaces=""
-gif_interfaces=""
-fec_interfaces=""
-ppp_enable="NO"
-ppp_program="/usr/sbin/ppp"
-ppp_mode="auto"
-ppp_nat="YES"
-ppp_profile="papchap"
-ppp_user="root"
-hostapd_enable="NO"
-syslogd_enable="YES"
-syslogd_program="/usr/sbin/syslogd"
-syslogd_flags="-s"
-inetd_enable="NO"
-inetd_program="/usr/sbin/inetd"
-inetd_flags="-wW -C 60"
-named_enable="NO"
-named_program="/usr/sbin/named"
-named_conf="/etc/namedb/named.conf"
-named_pidfile="/var/run/named/pid"
-named_uid="bind"
-named_chrootdir="/var/named"
-named_chroot_autoupdate="YES"
-named_symlink_enable="YES"
-named_wait="NO"
-named_wait_host="localhost"
-named_auto_forward="NO"
-named_auto_forward_only="NO"
-kerberos5_server_enable="NO"
-kerberos5_server="/usr/libexec/kdc"
-kerberos5_server_flags="--detach"
-kadmind5_server_enable="NO"
-kadmind5_server="/usr/libexec/kadmind"
-kpasswdd_server_enable="NO"
-kpasswdd_server="/usr/libexec/kpasswdd"
-gssd_enable="NO"
-gssd_flags=""
-rwhod_enable="NO"
-rwhod_flags=""
-rarpd_enable="NO"
-rarpd_flags="-a"
-bootparamd_enable="NO"
-bootparamd_flags=""
-pppoed_enable="NO"
-pppoed_provider="*"
-pppoed_flags="-P /var/run/pppoed.pid"
-pppoed_interface="fxp0"
-sshd_enable="NO"
-sshd_program="/usr/sbin/sshd"
-sshd_flags=""
-ftpd_enable="NO"
-ftpd_program="/usr/libexec/ftpd"
-ftpd_flags=""
-amd_enable="NO"
-amd_program="/usr/sbin/amd"
+firewall_enable="NO"
+firewall_script="/etc/rc.firewall"
+firewall_type="UNKNOWN"
+firewall_quiet="NO"
+firewall_logging="NO"
+firewall_flags=""
+firewall_client_net="192.0.2.0/24"
+firewall_simple_iif="ed1"
+firewall_simple_inet="192.0.2.16/28"
+firewall_simple_oif="ed0"
+firewall_simple_onet="192.0.2.0/28"
+firewall_myservices=""
+firewall_allowservices=""
+firewall_trusted=""
+firewall_logdeny="NO"
+firewall_nologports="135-139,445 1026,1027 1433,1434"
+firewall_nat_enable="NO"
+firewall_nat_interface=""
+firewall_nat_flags=""
+dummynet_enable="NO"
+ip_portrange_first="NO"
+ip_portrange_last="NO"
+ike_enable="NO"
+ike_program="/usr/local/sbin/isakmpd"
+ike_flags=""
+ipsec_enable="NO"
+ipsec_file="/etc/ipsec.conf"
+natd_program="/sbin/natd"
+natd_enable="NO"
+natd_interface=""
+natd_flags=""
+ipfilter_enable="NO"
+ipfilter_program="/sbin/ipf"
+ipfilter_rules="/etc/ipf.rules"
+ipfilter_flags=""
+ipnat_enable="NO"
+ipnat_program="/sbin/ipnat"
+ipnat_rules="/etc/ipnat.rules"
+ipnat_flags=""
+ipmon_enable="NO"
+ipmon_program="/sbin/ipmon"
+ipmon_flags="-Ds"
+ipfs_enable="NO"
+ipfs_program="/sbin/ipfs"
+ipfs_flags=""
+pf_enable="NO"
+pf_rules="/etc/pf.conf"
+pf_program="/sbin/pfctl"
+pf_flags=""
+pflog_enable="NO"
+pflog_logfile="/var/log/pflog"
+pflog_program="/sbin/pflogd"
+pflog_flags=""
+ftpproxy_enable="NO"
+ftpproxy_flags=""
+pfsync_enable="NO"
+pfsync_syncdev=""
+pfsync_syncpeer=""
+pfsync_ifconfig=""
+tcp_extensions="YES"
+log_in_vain="0"
+tcp_keepalive="YES"
+tcp_drop_synfin="NO"
+icmp_drop_redirect="NO"
+icmp_log_redirect="NO"
+network_interfaces="auto"
+cloned_interfaces=""
+ifconfig_lo0="inet 127.0.0.1"
+sppp_interfaces=""
+gif_interfaces=""
+fec_interfaces=""
+ppp_enable="NO"
+ppp_program="/usr/sbin/ppp"
+ppp_mode="auto"
+ppp_nat="YES"
+ppp_profile="papchap"
+ppp_user="root"
+hostapd_enable="NO"
+syslogd_enable="YES"
+syslogd_program="/usr/sbin/syslogd"
+syslogd_flags="-s"
+inetd_enable="NO"
+inetd_program="/usr/sbin/inetd"
+inetd_flags="-wW -C 60"
+named_enable="NO"
+named_program="/usr/sbin/named"
+named_conf="/etc/namedb/named.conf"
+named_pidfile="/var/run/named/pid"
+named_uid="bind"
+named_chrootdir="/var/named"
+named_chroot_autoupdate="YES"
+named_symlink_enable="YES"
+named_wait="NO"
+named_wait_host="localhost"
+named_auto_forward="NO"
+named_auto_forward_only="NO"
+kerberos5_server_enable="NO"
+kerberos5_server="/usr/libexec/kdc"
+kerberos5_server_flags="--detach"
+kadmind5_server_enable="NO"
+kadmind5_server="/usr/libexec/kadmind"
+kpasswdd_server_enable="NO"
+kpasswdd_server="/usr/libexec/kpasswdd"
+gssd_enable="NO"
+gssd_flags=""
+rwhod_enable="NO"
+rwhod_flags=""
+rarpd_enable="NO"
+rarpd_flags="-a"
+bootparamd_enable="NO"
+bootparamd_flags=""
+pppoed_enable="NO"
+pppoed_provider="*"
+pppoed_flags="-P /var/run/pppoed.pid"
+pppoed_interface="fxp0"
+sshd_enable="NO"
+sshd_program="/usr/sbin/sshd"
+sshd_flags=""
+ftpd_enable="NO"
+ftpd_program="/usr/libexec/ftpd"
+ftpd_flags=""
+amd_enable="NO"
+amd_program="/usr/sbin/amd"
amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map"
-amd_map_program="NO"
-nfs_client_enable="NO"
-nfs_access_cache="60"
-nfs_server_enable="NO"
-nfs_server_flags="-u -t -n 4"
-mountd_enable="NO"
-mountd_flags="-r"
-weak_mountd_authentication="NO"
-nfs_reserved_port_only="NO"
-nfs_bufpackets=""
-rpc_lockd_enable="NO"
-rpc_lockd_flags=""
-rpc_statd_enable="NO"
-rpc_statd_flags=""
-rpcbind_enable="NO"
-rpcbind_program="/usr/sbin/rpcbind"
-rpcbind_flags=""
-rpc_ypupdated_enable="NO"
-keyserv_enable="NO"
-keyserv_flags=""
-nfsv4_server_enable="NO"
-nfscbd_enable="NO"
-nfscbd_flags=""
-nfsuserd_enable="NO"
-nfsuserd_flags=""
-timed_enable="NO"
-timed_flags=""
-ntpdate_enable="NO"
-ntpdate_program="/usr/sbin/ntpdate"
-ntpdate_flags="-b"
-ntpdate_config="/etc/ntp.conf"
-ntpdate_hosts=""
-ntpd_enable="NO"
-ntpd_program="/usr/sbin/ntpd"
-ntpd_config="/etc/ntp.conf"
-ntpd_sync_on_start="NO"
+amd_map_program="NO"
+nfs_client_enable="NO"
+nfs_access_cache="60"
+nfs_server_enable="NO"
+nfs_server_flags="-u -t -n 4"
+mountd_enable="NO"
+mountd_flags="-r"
+weak_mountd_authentication="NO"
+nfs_reserved_port_only="NO"
+nfs_bufpackets=""
+rpc_lockd_enable="NO"
+rpc_lockd_flags=""
+rpc_statd_enable="NO"
+rpc_statd_flags=""
+rpcbind_enable="NO"
+rpcbind_program="/usr/sbin/rpcbind"
+rpcbind_flags=""
+rpc_ypupdated_enable="NO"
+keyserv_enable="NO"
+keyserv_flags=""
+nfsv4_server_enable="NO"
+nfscbd_enable="NO"
+nfscbd_flags=""
+nfsuserd_enable="NO"
+nfsuserd_flags=""
+timed_enable="NO"
+timed_flags=""
+ntpdate_enable="NO"
+ntpdate_program="/usr/sbin/ntpdate"
+ntpdate_flags="-b"
+ntpdate_config="/etc/ntp.conf"
+ntpdate_hosts=""
+ntpd_enable="NO"
+ntpd_program="/usr/sbin/ntpd"
+ntpd_config="/etc/ntp.conf"
+ntpd_sync_on_start="NO"
ntpd_flags="-p /var/run/ntpd.pid -f /var/db/ntpd.drift"
-nis_client_enable="NO"
-nis_client_flags=""
-nis_ypset_enable="NO"
-nis_ypset_flags=""
-nis_server_enable="NO"
-nis_server_flags=""
-nis_ypxfrd_enable="NO"
-nis_ypxfrd_flags=""
-nis_yppasswdd_enable="NO"
-nis_yppasswdd_flags=""
-bsnmpd_enable="NO"
-bsnmpd_flags=""
-defaultrouter="NO"
-static_arp_pairs=""
-static_routes=""
-natm_static_routes=""
-gateway_enable="NO"
-routed_enable="NO"
-routed_program="/sbin/routed"
-routed_flags="-q"
-mrouted_enable="NO"
-mrouted_program="/usr/local/sbin/mrouted"
-mrouted_flags=""
-ipxgateway_enable="NO"
-ipxrouted_enable="NO"
-ipxrouted_flags=""
-arpproxy_all="NO"
-forward_sourceroute="NO"
-accept_sourceroute="NO"
-atm_enable="NO"
-atm_pvcs=""
-atm_arps=""
-hcsecd_enable="NO"
-hcsecd_config="/etc/bluetooth/hcsecd.conf"
-sdpd_enable="NO"
-sdpd_control="/var/run/sdp"
-sdpd_groupname="nobody"
-sdpd_username="nobody"
-bthidd_enable="NO"
-bthidd_config="/etc/bluetooth/bthidd.conf"
-bthidd_hids="/var/db/bthidd.hids"
-rfcomm_pppd_server_enable="NO"
-rfcomm_pppd_server_profile="one two"
-rfcomm_pppd_server_one_channel="1"
-rfcomm_pppd_server_two_channel="3"
-icmp_bmcastecho="NO"
-keyboard=""
-keymap="NO"
-keyrate="NO"
-keybell="NO"
-keychange="NO"
-cursor="NO"
-scrnmap="NO"
-font8x16="NO"
-font8x14="NO"
-font8x8="NO"
-blanktime="300"
-saver="NO"
-moused_nondefault_enable="YES"
-moused_enable="NO"
-moused_type="auto"
-moused_port="/dev/psm0"
-moused_flags=""
-mousechar_start="NO"
-allscreens_flags=""
-allscreens_kbdflags=""
+nis_client_enable="NO"
+nis_client_flags=""
+nis_ypset_enable="NO"
+nis_ypset_flags=""
+nis_server_enable="NO"
+nis_server_flags=""
+nis_ypxfrd_enable="NO"
+nis_ypxfrd_flags=""
+nis_yppasswdd_enable="NO"
+nis_yppasswdd_flags=""
+bsnmpd_enable="NO"
+bsnmpd_flags=""
+defaultrouter="NO"
+static_arp_pairs=""
+static_routes=""
+natm_static_routes=""
+gateway_enable="NO"
+routed_enable="NO"
+routed_program="/sbin/routed"
+routed_flags="-q"
+mrouted_enable="NO"
+mrouted_program="/usr/local/sbin/mrouted"
+mrouted_flags=""
+ipxgateway_enable="NO"
+ipxrouted_enable="NO"
+ipxrouted_flags=""
+arpproxy_all="NO"
+forward_sourceroute="NO"
+accept_sourceroute="NO"
+atm_enable="NO"
+atm_pvcs=""
+atm_arps=""
+hcsecd_enable="NO"
+hcsecd_config="/etc/bluetooth/hcsecd.conf"
+sdpd_enable="NO"
+sdpd_control="/var/run/sdp"
+sdpd_groupname="nobody"
+sdpd_username="nobody"
+bthidd_enable="NO"
+bthidd_config="/etc/bluetooth/bthidd.conf"
+bthidd_hids="/var/db/bthidd.hids"
+rfcomm_pppd_server_enable="NO"
+rfcomm_pppd_server_profile="one two"
+rfcomm_pppd_server_one_channel="1"
+rfcomm_pppd_server_two_channel="3"
+icmp_bmcastecho="NO"
+keyboard=""
+keymap="NO"
+keyrate="NO"
+keybell="NO"
+keychange="NO"
+cursor="NO"
+scrnmap="NO"
+font8x16="NO"
+font8x14="NO"
+font8x8="NO"
+blanktime="300"
+saver="NO"
+moused_nondefault_enable="YES"
+moused_enable="NO"
+moused_type="auto"
+moused_port="/dev/psm0"
+moused_flags=""
+mousechar_start="NO"
+allscreens_flags=""
+allscreens_kbdflags=""
mta_start_script="/etc/rc.sendmail"
-sendmail_enable="NO"
-sendmail_pidfile="/var/run/sendmail.pid"
-sendmail_procname="/usr/sbin/sendmail"
-sendmail_flags="-L sm-mta -bd -q30m"
-sendmail_submit_enable="YES"
+sendmail_enable="NO"
+sendmail_pidfile="/var/run/sendmail.pid"
+sendmail_procname="/usr/sbin/sendmail"
+sendmail_flags="-L sm-mta -bd -q30m"
+sendmail_submit_enable="YES"
sendmail_submit_flags="-L sm-mta -bd -q30m -ODaemonPortOptions=Addr=localhost"
-sendmail_outbound_enable="YES"
-sendmail_outbound_flags="-L sm-queue -q30m"
-sendmail_msp_queue_enable="YES"
+sendmail_outbound_enable="YES"
+sendmail_outbound_flags="-L sm-queue -q30m"
+sendmail_msp_queue_enable="YES"
sendmail_msp_queue_flags="-L sm-msp-queue -Ac -q30m"
-sendmail_rebuild_aliases="NO"
-auditd_enable="NO"
-auditd_program="/usr/sbin/auditd"
-auditd_flags=""
-cron_enable="YES"
-cron_program="/usr/sbin/cron"
-cron_dst="YES"
-cron_flags=""
-lpd_enable="NO"
-lpd_program="/usr/sbin/lpd"
-lpd_flags=""
-nscd_enable="NO"
-chkprintcap_enable="NO"
-chkprintcap_flags="-d"
-dumpdev="AUTO"
-dumpdir="/var/crash"
-savecore_flags=""
-crashinfo_enable="YES"
-crashinfo_program="/usr/sbin/crashinfo"
-quota_enable="NO"
-check_quotas="YES"
-quotaon_flags="-a"
-quotaoff_flags="-a"
-quotacheck_flags="-a"
-accounting_enable="NO"
-ibcs2_enable="NO"
-ibcs2_loaders="coff"
-sysvipc_enable="NO"
-linux_enable="NO"
-svr4_enable="NO"
-clear_tmp_enable="NO"
-clear_tmp_X="YES"
-ldconfig_insecure="NO"
+sendmail_rebuild_aliases="NO"
+auditd_enable="NO"
+auditd_program="/usr/sbin/auditd"
+auditd_flags=""
+cron_enable="YES"
+cron_program="/usr/sbin/cron"
+cron_dst="YES"
+cron_flags=""
+lpd_enable="NO"
+lpd_program="/usr/sbin/lpd"
+lpd_flags=""
+nscd_enable="NO"
+chkprintcap_enable="NO"
+chkprintcap_flags="-d"
+dumpdev="AUTO"
+dumpdir="/var/crash"
+savecore_flags=""
+crashinfo_enable="YES"
+crashinfo_program="/usr/sbin/crashinfo"
+quota_enable="NO"
+check_quotas="YES"
+quotaon_flags="-a"
+quotaoff_flags="-a"
+quotacheck_flags="-a"
+accounting_enable="NO"
+ibcs2_enable="NO"
+ibcs2_loaders="coff"
+sysvipc_enable="NO"
+linux_enable="NO"
+svr4_enable="NO"
+clear_tmp_enable="NO"
+clear_tmp_X="YES"
+ldconfig_insecure="NO"
ldconfig_paths="/usr/lib/compat /usr/local/lib /usr/local/lib/compat/pkg"
-ldconfig32_paths="/usr/lib32"
+ldconfig32_paths="/usr/lib32"
ldconfig_paths_aout="/usr/lib/compat/aout /usr/local/lib/aout"
ldconfig_local_dirs="/usr/local/libdata/ldconfig"
ldconfig_local32_dirs="/usr/local/libdata/ldconfig32"
-kern_securelevel_enable="NO"
-kern_securelevel="-1"
-update_motd="YES"
-entropy_file="/entropy"
-entropy_dir="/var/db/entropy"
-entropy_save_sz="2048"
-entropy_save_num="8"
-harvest_interrupt="YES"
-harvest_ethernet="YES"
-harvest_p_to_p="YES"
-dmesg_enable="YES"
-watchdogd_enable="NO"
-watchdogd_flags=""
-devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules"
-devfs_system_ruleset=""
-devfs_set_rulesets=""
-performance_cx_lowest="HIGH"
-performance_cpu_freq="NONE"
-economy_cx_lowest="HIGH"
-economy_cpu_freq="NONE"
-virecover_enable="YES"
-ugidfw_enable="NO"
-newsyslog_enable="YES"
-newsyslog_flags="-CN"
-mixer_enable="YES"
-jail_enable="NO"
-jail_list=""
-jail_set_hostname_allow="YES"
-jail_socket_unixiproute_only="YES"
-jail_sysvipc_allow="NO"
+kern_securelevel_enable="NO"
+kern_securelevel="-1"
+update_motd="YES"
+entropy_file="/entropy"
+entropy_dir="/var/db/entropy"
+entropy_save_sz="2048"
+entropy_save_num="8"
+harvest_interrupt="YES"
+harvest_ethernet="YES"
+harvest_p_to_p="YES"
+dmesg_enable="YES"
+watchdogd_enable="NO"
+watchdogd_flags=""
+devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules"
+devfs_system_ruleset=""
+devfs_set_rulesets=""
+performance_cx_lowest="HIGH"
+performance_cpu_freq="NONE"
+economy_cx_lowest="HIGH"
+economy_cpu_freq="NONE"
+virecover_enable="YES"
+ugidfw_enable="NO"
+newsyslog_enable="YES"
+newsyslog_flags="-CN"
+mixer_enable="YES"
+jail_enable="NO"
+jail_list=""
+jail_set_hostname_allow="YES"
+jail_socket_unixiproute_only="YES"
+jail_sysvipc_allow="NO"
if [ -z "${source_rc_confs_defined}" ]; then
source_rc_confs_defined=yes
source_rc_confs () {
diff -r da08f56b0dc9 -r 67a155d37199 profiles/xSMALL_/files/etc/network.subr
--- a/profiles/xSMALL_/files/etc/network.subr Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/xSMALL_/files/etc/network.subr Mon Feb 06 13:01:03 2012 +0200
@@ -533,14 +533,14 @@
ipv4_addrs_common()
{
local _ret _if _action _cidr _cidr_addr
- local _ipaddr _netmask _range _ipnet _iplow _iphigh _ipcount
+ local _ipaddr _netmask _range _ipnet _iplow _iphigh _ipcount
_ret=1
_if=$1
_action=$2
-
+
# get ipv4-addresses
cidr_addr=`get_if_var $_if ipv4_addrs_IF`
-
+
for _cidr in ${cidr_addr}; do
_ipaddr=${_cidr%%/*}
_netmask="/"${_cidr##*/}
@@ -553,7 +553,7 @@
if [ "${_action}" = "-alias" ]; then
_netmask=""
fi
-
+
_ipcount=${_iplow}
while [ "${_ipcount}" -le "${_iphigh}" ]; do
eval "ifconfig ${_if} ${_action} ${_ipnet}.${_ipcount}${_netmask}"
diff -r da08f56b0dc9 -r 67a155d37199 profiles/xSMALL_/files/etc/networks
--- a/profiles/xSMALL_/files/etc/networks Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/xSMALL_/files/etc/networks Mon Feb 06 13:01:03 2012 +0200
@@ -1,4 +1,4 @@
-your-net 127
-your-netmask 255.255.255
-subnet1 127.0.1 alias1
-subnet2 127.0.2 alias2
+your-net 127
+your-netmask 255.255.255
+subnet1 127.0.1 alias1
+subnet2 127.0.2 alias2
diff -r da08f56b0dc9 -r 67a155d37199 profiles/xSMALL_/files/etc/rc.d/MAIN
--- a/profiles/xSMALL_/files/etc/rc.d/MAIN Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/xSMALL_/files/etc/rc.d/MAIN Mon Feb 06 13:01:03 2012 +0200
@@ -33,7 +33,7 @@
mount_unionfs /tmp/etc /etc
- if [ -c /dev/map/config ]; then
+ if [ -c /dev/map/config ]; then
dd if=/dev/map/config of=/tmp/etc.tar.gz;
cd /tmp/ && tar xvzf /tmp/etc.tar.gz
fi
@@ -58,7 +58,7 @@
main_stop()
{
- if [ -c /dev/map/config ]; then
+ if [ -c /dev/map/config ]; then
cd /tmp/ && tar cvzf /tmp/etc.tar.gz etc/* ;
sysctl hw.cfi.rdonly=0
dd if=/tmp/etc.tar.gz of=/dev/map/config bs=64k conv=sync ;
diff -r da08f56b0dc9 -r 67a155d37199 profiles/xSMALL_/files/etc/rc.firewall
--- a/profiles/xSMALL_/files/etc/rc.firewall Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/xSMALL_/files/etc/rc.firewall Mon Feb 06 13:01:03 2012 +0200
@@ -134,12 +134,12 @@
${fwcmd} add deny { tcp or udp } from any to any $i in
done
${fwcmd} add deny ip from any to 255.255.255.255
- ${fwcmd} add deny ip from any to 224.0.0.0/24 in
+ ${fwcmd} add deny ip from any to 224.0.0.0/24 in
${fwcmd} add deny udp from any to any 520 in
${fwcmd} add deny tcp from any 80,443 to any 1024-65535 in
log=""
if [ ${firewall_logdeny:-x} = "YES" -o ${firewall_logdeny:-x} = "yes" ] ; then
- log="log logamount 500"
+ log="log logamount 500"
sysctl net.inet.ip.fw.verbose=1 >/dev/null
fi
${fwcmd} add deny $log ip from any to any
diff -r da08f56b0dc9 -r 67a155d37199 profiles/xSMALL_/files/etc/rc.shutdown
--- a/profiles/xSMALL_/files/etc/rc.shutdown Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/xSMALL_/files/etc/rc.shutdown Mon Feb 06 13:01:03 2012 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
stty status '^T'
trap : 2
-trap : 3
+trap : 3
HOME=/
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
export HOME PATH
diff -r da08f56b0dc9 -r 67a155d37199 profiles/xSMALL_/files/etc/save_etc
--- a/profiles/xSMALL_/files/etc/save_etc Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/xSMALL_/files/etc/save_etc Mon Feb 06 13:01:03 2012 +0200
@@ -26,7 +26,7 @@
echo "etc.tar.gz too big ${size}, must be less than ${DEVCONFIGSIZE}"
echo "Please remove big files from /etc"
exit 1
-fi
+fi
echo "Saving /etc"
sysctl hw.cfi.rdonly=0
diff -r da08f56b0dc9 -r 67a155d37199 profiles/zhttpd/profile.mk
--- a/profiles/zhttpd/profile.mk Mon Feb 06 12:39:24 2012 +0200
+++ b/profiles/zhttpd/profile.mk Mon Feb 06 13:01:03 2012 +0200
@@ -1,6 +1,6 @@
# XXX path must not be hardcoded, or must point to zhttpd in ports tree
-WORLD_SUBDIRS_PORTS+=${ZROUTER_ROOT}/ports/www/libmicrohttpd
-WORLD_SUBDIRS_PORTS+=${ZROUTER_ROOT}/ports/www/zhttpd/
+WORLD_SUBDIRS_PORTS+=${ZROUTER_ROOT}/ports/www/libmicrohttpd
+WORLD_SUBDIRS_PORTS+=${ZROUTER_ROOT}/ports/www/zhttpd
More information about the Zrouter-src
mailing list