20190708_jeffrey - silenceuncrio/diary GitHub Wiki
0910
review
先 build 一份最新的 M360P - feature/lighttpd
M360P 上電 透過 uboot upgrade
root@M360-P:/home/admin# cp -r /www/ /tmp/
root@M360-P:/home/admin# cd /tmp/
root@M360-P:/tmp# tftp -g -r lighttpd.conf 192.168.1.113
root@M360-P:/tmp# tftp -g -r web_x509_lighttpd.sh 192.168.1.113
root@M360-P:/tmp# chmod 755 web_x509_lighttpd.sh
root@M360-P:/tmp# ./web_x509_lighttpd.sh
Generating a 2048 bit RSA private key
..................+++
.....+++
writing new private key to '/tmp/icos/web/lighttpd.pem'
-----
root@M360-P:/tmp# lighttpd -f /tmp/lighttpd.conf
2019-05-24 13:10:33: (log.c.166) server started
root@M360-P:/tmp#
M360P - feature/lighttpd - 'System > Ethernet Ports'
commit dd33a97e94172808807876dfa6f9ce44223186f9
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 09:25:37 2019 +0800
feature/lighttpd - 'System > Ethernet Ports'
switch.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _total_ports);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _status);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/switch.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
M360P - feature/lighttpd - 'System > Client List'
commit 180947fc73a6287d420da0715bf68a218f9c560c
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 09:29:24 2019 +0800
feature/lighttpd - 'System > Client List'
dhcp_client_list.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _lan);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/dhcp_client_list.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
M360P - feature/lighttpd - 'WAN > IPv6 DNS'
commit bf4d7c1b8c96f2f8fdf2868830ac338c791eadf6
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 09:46:35 2019 +0800
feature/lighttpd - 'WAN > IPv6 DNS'
dns.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/dns.c | 41 +++++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 16 deletions(-)
M360P - feature/lighttpd - 'LTE > LTE Config'
commit 9ce5d71a8ec59fdb687e23c07a6d531a484d18c2
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 09:52:00 2019 +0800
feature/lighttpd - 'LTE > LTE Config'
lte.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _modem_config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _modem_apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _sim_pin_config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _sim_pin_apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _gps_config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _gps_apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _sms_action_config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _sms_action_apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _query_eng);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _neighbor_pci);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _neighbor_pci_test);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _unlock_pci);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _lock_pci);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _lock_pci_conf);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _lock_pci_conf_apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _multi_neighbor_pci);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _get_multi_lock_pci);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _get_multi_lock_pci_conf_opt);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply_multi_lock_pci);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply_multi_lock_pci_conf_opt);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _get_band_hint);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _get_multi_band_conf_opt);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply_multi_band_conf_opt);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply_multi_lock_band);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _reset_default_band);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _clear_sms);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _get_operator_list);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/lte.c | 62 ++++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 31 deletions(-)
M360P - feature/lighttpd - 'LTE > APN1 Usage'/'LTE > APN2 Usage'
commit 73180625a1b09fd0c19cbc22a6f63030b1512954
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 10:01:05 2019 +0800
feature/lighttpd - 'LTE > APN1 Usage'/'LTE > APN2 Usage'
usage_display.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _hourly);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _daily);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _weekly);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _monthly);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _real_time);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _info);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/usage_display.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
M360P - feature/lighttpd - 'LTE > Serving Cell'
commit 11ac42e3b5d2a08ee6a752a1251ae5e56f39f237
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 10:09:52 2019 +0800
feature/lighttpd - 'LTE > Serving Cell'
- use 'cgi-bin/configuration.cgi?act=help' as the resolver of angular routeProvider
- make sure user have been login
configuration.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _backup);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _restore);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/configuration.c | 8 ++++----
proscend/prosrc/www/app/feature/serving_cell.js | 11 ++++++++++-
2 files changed, 14 insertions(+), 5 deletions(-)
M360P - feature/lighttpd - 'LTE > Lock PCI'
commit d8c3bd4b4182f8aae56561f2202d4b1338c5e43e
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 10:13:41 2019 +0800
feature/lighttpd - 'LTE > Lock PCI'
- use 'cgi-bin/configuration.cgi?act=help' as the resolver of angular routeProvider
- make sure user have been login
proscend/prosrc/www/app/feature/lock_pcis.js | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
M360P - feature/lighttpd - 'LTE > Search Operators'
commit 46acf1c0bfb2627e0247dcbf97e3e64de2a4f963
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 10:17:12 2019 +0800
feature/lighttpd - 'LTE > Search Operators'
- use 'cgi-bin/configuration.cgi?act=help' as the resolver of angular routeProvider
- make sure user have been login
proscend/prosrc/www/app/feature/search_operators.js | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
M360P - feature/lighttpd - 'LAN > IPv4'
commit 0e469bf9195db38f9ab8fcc5c933ebd65f799838
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 10:45:45 2019 +0800
feature/lighttpd - 'LAN > IPv4'
lan_control.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _set);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/lan_control.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
M360P - feature/lighttpd - 'LAN > IPv6'
commit cbe1b6f1f811ddb08f19ce57d457ec99585c9cda
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 10:50:55 2019 +0800
feature/lighttpd - 'LAN > IPv6'
ipv6lan.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _default);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/ipv6lan.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
M360P - feature/lighttpd - 'LAN > VLAN'
commit ce89d33cc4f60887a80eae1af209ab83bf37e279
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 10:52:40 2019 +0800
feature/lighttpd - 'LAN > VLAN'
vlan.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/vlan.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
M360P - feature/lighttpd - 'LAN > Subnet'
commit 7e7f5d9db28725e2d456d482e4fc4c7f9bd06027
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 10:57:20 2019 +0800
feature/lighttpd - 'LAN > Subnet'
vlan_lan_control.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/vlan_lan_control.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
M360P - feature/lighttpd - 'IP Routing > Static Route'
commit 2769c30efa4981520ab16815a09505a857473d98
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 11:20:44 2019 +0800
feature/lighttpd - 'IP Routing > Static Route'
route.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _status);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/route.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
M360P - feature/lighttpd - 'IP Routing > BGP'
commit b306268f876560556448e9f20a38e3e5db84f0a9
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 11:23:45 2019 +0800
feature/lighttpd - 'IP Routing > BGP'
bgp.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/bgp.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
M360P - feature/lighttpd - 'VPN > IPSec'
commit 9292337eb06756f065c068cb523a36a70336ba16
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 11:34:16 2019 +0800
feature/lighttpd - 'VPN > IPSec'
ipsec.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _status)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _conn_status)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _create)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _info)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _download)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _import)
proscend/prosrc/webcgi/ipsec.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
M360P - feature/lighttpd - 'VPN > GRE'
commit 3f67e3dd057413f9921d3ff6198bc1dfb27875e7
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 11:37:06 2019 +0800
feature/lighttpd - 'VPN > GRE'
gre.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help)
proscend/prosrc/webcgi/gre.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
M360P - feature/lighttpd - 'VPN > PPTP Server'
commit e74bbae20e93a1ab90ccd2bcdb576b190dffd7ba
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 11:40:24 2019 +0800
feature/lighttpd - 'VPN > PPTP Server'
pptpd.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help)
proscend/prosrc/webcgi/pptpd.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
M360P - feature/lighttpd - 'VPN > L2TP'
commit 5e12c6cdeb71d2210d3e476a64f1699138e51898
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 11:42:51 2019 +0800
feature/lighttpd - 'VPN > L2TP'
l2tp.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help)
proscend/prosrc/webcgi/l2tp.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
M360P - feature/lighttpd - 'Firewall > Port Forwading'
commit 9eca9833136b0bd46063db92dd39344443c2c4a1
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 11:45:10 2019 +0800
feature/lighttpd - 'Firewall > Port Forwading'
dnat.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help)
proscend/prosrc/webcgi/dnat.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
M360P - feature/lighttpd - 'Firewall > DMZ'
commit a87a64519aebc3862622ed557e2b1ab21c0b2b17
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 11:47:29 2019 +0800
feature/lighttpd - 'Firewall > DMZ'
dmz.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/dmz.c | 212 +++++++++++++++++++++----------------------
1 file changed, 106 insertions(+), 106 deletions(-)
M360P - feature/lighttpd - 'Firewall > IP Filter'
commit fe1fd002a82dbbaa35f22df90b1e54bbf4704953
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 11:49:56 2019 +0800
feature/lighttpd - 'Firewall > IP Filter'
ipfilter.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
proscend/prosrc/webcgi/ipfilter.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
M360P - feature/lighttpd - 'Firewall > MAC Filter'
commit 5fa3ae1e2c9501deaae34a47628392106eaa8633
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 11:51:58 2019 +0800
feature/lighttpd - 'Firewall > MAC Filter'
macfilter.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
proscend/prosrc/webcgi/macfilter.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
M360P - feature/lighttpd - 'Firewall > URL Filter'
commit 728c844c4011aa6c9f68ee8411cebb470718eae7
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 11:54:16 2019 +0800
feature/lighttpd - 'Firewall > URL Filter'
urlfilter.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
proscend/prosrc/webcgi/urlfilter.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
M360P - feature/lighttpd - 'Firewall > NAT'
commit 836bb711f2dc230dd37258adcc46a4206e79d27e
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 11:56:14 2019 +0800
feature/lighttpd - 'Firewall > NAT'
snat.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/snat.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
M360P - feature/lighttpd - 'Firewall > IPS'
commit e14a402f2e8bbc8e3183a7740c291505a7e4e212
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 11:58:49 2019 +0800
feature/lighttpd - 'Firewall > IPS'
firewall.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/firewall.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
1315
M360P - feature/lighttpd - 'Service > SNMP'
commit 326538f534b172c8556f4c50c48eab7f1b6bbc5e
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 13:15:13 2019 +0800
feature/lighttpd - 'Service > SNMP'
snmp.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply)
proscend/prosrc/webcgi/snmp.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
M360P - feature/lighttpd - 'Service > TR069'
commit 2151a89aa087ddc93e57451d35b449d6bb85beca
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 13:17:54 2019 +0800
feature/lighttpd - 'Service > TR069'
cwmp.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/cwmp.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
M360P - feature/lighttpd - 'Service > VRRP'
commit 526830d55fa75766c1ace6e240ab6c2484f7490b
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 13:21:48 2019 +0800
feature/lighttpd - 'Service > VRRP'
vrrp.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/vrrp.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
M360P - feature/lighttpd - 'Service > SMTP'
commit 7d463c61ad30196e7b2104eea1d356e8abb24ae9
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 13:24:19 2019 +0800
feature/lighttpd - 'Service > SMTP'
smtp.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/smtp.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
M360P - feature/lighttpd - 'Service > IP Alias'
commit 3ae131bd36a9b9ac9af38c5cbc862f6e4c9a1c34
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 13:29:24 2019 +0800
feature/lighttpd - 'Service > IP Alias'
ip_alias.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply)
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
use the full path '/usr/sbin/icos/RouteStatus.sh' instead of 'RouteStatus.sh'
proscend/prosrc/webcgi/ip_alias.c | 8 ++++----
proscend/prosrc/webcgi/route.c | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
M360P - feature/lighttpd - 'Service > QoS'
commit 526ef78d81e4398ecb370c54bd3fd82e6cbc2dce
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 13:32:36 2019 +0800
feature/lighttpd - 'Service > QoS'
qos.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _status);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/qos.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
M360P - feature/lighttpd - 'Management > Identification' and 'Management > Administration'
commit 4f9f9d51591f7c25f17f5c9ad0137bb3432bfe3b
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 13:40:40 2019 +0800
feature/lighttpd - 'Management > Identification' and 'Management > Administration'
system.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _status);
proscend/prosrc/webcgi/system.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
M360P - feature/lighttpd - 'Management > SSH'
commit e690ec66283262de48cae2e7a00eafea87774e03
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 13:43:25 2019 +0800
feature/lighttpd - 'Management > SSH'
ssh.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/ssh.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
1345
M360 - feature/lighttpd - 'Management > Firmware'
重頭戲
commit 04d8504ab0f9d3928eda0f4de0c371a82a17dd1d
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 14:03:20 2019 +0800
feature/lighttpd - 'Management > Firmware'
api.cgi
- jweb.api.upload_file(UPLOAD_PATH_FIRMWARE);
firmware.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _upgrade);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _progress);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
icos_config.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _coldreboot);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _load_factory_and_reboot);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
at firmware.cgi, use the full path '/usr/sbin/icos/FirmwareProgress.sh' instead of 'FirmwareProgress.sh'
at FirmwareProgress.sh, no echo at progress_update() or http header will be a problem
at FirmwareUpgrade.sh, use the full path `/sin/mtd` instead of 'mtd'
offer CGI for firmware upload - POST /cgi-bin/api/cgi?act=firmwareUpload
- lighttpd rewrite will rewrite `/api/firmwareUpload` to `/cgi-bin/api/cgi?act=firmwareUpload`
- jweb need further handle when REQUEST_METHOD="POST" and QUERY_STRING="act=firmwareUpload"
- cgilib parse QUERY_STRING only when REQUEST_METHOD="GET"
at reboot page, use 'cgi-bin/icos_config.cgi?act=help' as the resolver of angular routeProvider
- make sure user have been login
note that in the config-file for lighttpd, we need put `server.upload-dirs = ( "/tmp" )`,
or upload file with size more than 64KB will get 413 - `Request Entity Too Large` from lighttpd
proscend/prosrc/icos/script/FirmwareProgress.sh | 1 -
proscend/prosrc/icos/script/FirmwareUpgrade.sh | 2 +-
proscend/prosrc/webcgi/api.c | 4 ++
proscend/prosrc/webcgi/firmware.c | 11 ++--
proscend/prosrc/webcgi/icos_config.c | 8 +--
proscend/prosrc/webcgi/jweb.c | 75 ++++++++++++++++++++++--
proscend/prosrc/webcgi/jweb.h | 21 +++++++
proscend/prosrc/www/app/feature/reboot.js | 11 +++-
proscend/prosrc/www/app/services/icos.service.js | 3 +
9 files changed, 118 insertions(+), 18 deletions(-)
M360P - feature/lighttpd - 'Management > Configuartion'
commit 3cdcdd45c36261b57f950eaaafef772cea8d472d
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 14:12:22 2019 +0800
feature/lighttpd - 'Management > Configuartion'
api.cgi
- jweb.api.upload_file(UPLOAD_PATH_CONFIGURATION);
offer CGI for configuration upload - POST /cgi-bin/api/cgi?act=configurationUpload
- lighttpd rewrite will rewrite `/api/configurationUpload` to `/cgi-bin/api/cgi?act=configurationUpload`
- jweb need further handle when REQUEST_METHOD="POST" and QUERY_STRING="act=configurationUpload"
- cgilib parse QUERY_STRING only when REQUEST_METHOD="GET"
proscend/prosrc/webcgi/api.c | 4 ++++
1 file changed, 4 insertions(+)
M360P - feature/lighttpd - 'Management > Load Factory'
commit 4f5f2c80ba9958182828c86ba3fddd37413e69a4
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 14:16:29 2019 +0800
feature/lighttpd - 'Management > Load Factory'
- use 'cgi-bin/configuration.cgi?act=help' as the resolver of angular routeProvider
- make sure user have been login
proscend/prosrc/www/app/feature/factory_and_reboot.js | 13 +++++++++++--
proscend/prosrc/www/app/feature/load_factory.js | 11 ++++++++++-
2 files changed, 21 insertions(+), 3 deletions(-)
M360P - feature/lighttpd - 'Management > Restart'
commit 0a1de3f845c5a1e83de173683cb8c0da2abcaed8
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 14:18:33 2019 +0800
feature/lighttpd - 'Management > Restart'
- use 'cgi-bin/configuration.cgi?act=help' as the resolver of angular routeProvider
- make sure user have been login
proscend/prosrc/www/app/feature/restart.js | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
M360P - feature/lighttpd - 'Management > Schedule Reboot'
commit 1229d6670f158e0a3abef09a9f22b0d80b6c842d
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 14:21:16 2019 +0800
feature/lighttpd - 'Management > Schedule Reboot'
schedule_reboot.cgi
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _config);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL2, _apply);
- jweb.access.filter(ATTVAL_SYSTEM_LEVEL1, _help);
proscend/prosrc/webcgi/schedule_reboot.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
M360P - feature/lighttpd - offer CGI for upload
commit feee799800562079c0fde195570886c4c6e16f6f
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 14:24:05 2019 +0800
feature/lighttpd - offer CGI for upload
- ipsecUpload - POST /cgi-bin/api/cgi?act=ipsecUpload
- before rewrite - /api/ipsecUpload
- jweb need further handle when REQUEST_METHOD="POST" and QUERY_STRING="act=ipsecUpload"
proscend/prosrc/webcgi/api.c | 4 ++++
1 file changed, 4 insertions(+)
1425
M360 - feature/lighttpd - replace the iweb with lighttpd at icos web module
commit 2c8296353b27d5c81ad22e231cc403f6c1697d90
Refs: [feature/lighttpd], {origin/feature/lighttpd}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 14:45:16 2019 +0800
feature/lighttpd - replace the iweb with lighttpd at icos web module
- use web_x509_lighttpd.sh instead of web_x509.sh
- the arg for openssl command options `-keyout` and `-out` are different for iweb
- iweb_key.pem for `-keyout`
- iweb_cert.pem for `-out`
- but the arg for openssl command options `-keyout` and `-out` are the same for lighttpd
- lighttpd.pem for `-keyout` and `-out`
- prepare the x509 certificate at RAM first then move it to the NANDFLASH
- use `-D` command option to tell lighttpd don't go to background
- or after ICOS_ProcLaunch(), proc_msg_cb will be a problem
- before launch the lighttpd, prepare the configuraion for it base on icos web configuraion
- keep the same 2 daemon control but only use the daemon with id DID_HTTPS
- one lighttpd process can serve HTTP and HTTPS at the same time
- keep the same 2 daemon control at icos module save the implementing time
proscend/prosrc/icos/icoslib/web/webcfg.c | 172 +++++++++++++++++------
proscend/prosrc/icos/script/web_x509_lighttpd.sh | 5 +
2 files changed, 136 insertions(+), 41 deletions(-)
這禮拜的進度做完了
有充分的時間可以把 feature/lighttpd merge 回 develop
可以輕鬆一下 想想看什麼平台先作 merge 的動作
1500
check 一下什麼平台的 develop 已經跟最後的 release 作 merge 了
- M300
- 還沒
- M330
- yes
- M360P
- yes
就從 M330 來做吧
1640
M330 - develop - Merge branch 'feature/lighttpd' into develop
commit 1f9c37691cbc797e944068790ec52f5e67d777c3
Refs: [develop]
Merge: 7ae24d7 dd4b358
Author: jeffrey <[email protected]>
Date: Mon Jul 8 16:38:17 2019 +0800
Merge branch 'feature/lighttpd' into develop
M330_defconfig | 5 +-
proscend/Makefile | 3 +-
proscend/prosrc/icos/icoslib/openvpn/openvpn.c | 2 +-
proscend/prosrc/icos/icoslib/web/webcfg.c | 230 +++++----
proscend/prosrc/icos/script/FirmwareProgress.sh | 2 +-
proscend/prosrc/icos/script/FirmwareUpgrade.sh | 40 +-
proscend/prosrc/icos/script/web_x509_lighttpd.sh | 5 +
proscend/prosrc/webcgi/Makefile | 9 +-
proscend/prosrc/webcgi/alarm.c | 76 ++-
proscend/prosrc/webcgi/api.c | 58 +++
proscend/prosrc/webcgi/bgp.c | 8 +-
proscend/prosrc/webcgi/configuration.c | 8 +-
proscend/prosrc/webcgi/connmgr.c | 20 +-
proscend/prosrc/webcgi/cwmp.c | 8 +-
proscend/prosrc/webcgi/ddns.c | 8 +-
proscend/prosrc/webcgi/dhcp_client_list.c | 6 +-
proscend/prosrc/webcgi/dmz.c | 10 +-
proscend/prosrc/webcgi/dnat.c | 8 +-
proscend/prosrc/webcgi/dns.c | 38 +-
proscend/prosrc/webcgi/firewall.c | 8 +-
proscend/prosrc/webcgi/firewall6.c | 8 +-
proscend/prosrc/webcgi/firmware.c | 10 +-
proscend/prosrc/webcgi/gre.c | 8 +-
proscend/prosrc/webcgi/icos_config.c | 8 +-
proscend/prosrc/webcgi/ip_alias.c | 8 +-
proscend/prosrc/webcgi/ipfilter.c | 6 +-
proscend/prosrc/webcgi/ipsec.c | 19 +-
proscend/prosrc/webcgi/ipv6lan.c | 10 +-
proscend/prosrc/webcgi/jweb.c | 516 ++++++++++++++++++++-
proscend/prosrc/webcgi/jweb.h | 88 +++-
proscend/prosrc/webcgi/l2tp.c | 8 +-
proscend/prosrc/webcgi/lan_control.c | 8 +-
proscend/prosrc/webcgi/lte.c | 62 +--
proscend/prosrc/webcgi/macfilter.c | 6 +-
proscend/prosrc/webcgi/mqtt.c | 8 +-
proscend/prosrc/webcgi/openvpn.c | 101 ++--
proscend/prosrc/webcgi/ospf_2g.c | 8 +-
proscend/prosrc/webcgi/pppoe.c | 292 ++++++------
proscend/prosrc/webcgi/pptpd.c | 8 +-
proscend/prosrc/webcgi/rip_2g.c | 8 +-
proscend/prosrc/webcgi/route.c | 14 +-
proscend/prosrc/webcgi/schedule_reboot.c | 8 +-
proscend/prosrc/webcgi/smtp.c | 8 +-
proscend/prosrc/webcgi/snat.c | 8 +-
proscend/prosrc/webcgi/snmp.c | 6 +-
proscend/prosrc/webcgi/sntp.c | 8 +-
proscend/prosrc/webcgi/ssh.c | 8 +-
proscend/prosrc/webcgi/switch.c | 10 +-
proscend/prosrc/webcgi/syslog.c | 17 +-
proscend/prosrc/webcgi/system.c | 8 +-
proscend/prosrc/webcgi/upnp.c | 8 +-
proscend/prosrc/webcgi/urlfilter.c | 6 +-
proscend/prosrc/webcgi/usage_display.c | 16 +-
proscend/prosrc/webcgi/vlan.c | 8 +-
proscend/prosrc/webcgi/vlan_lan_control.c | 8 +-
proscend/prosrc/webcgi/vrrp.c | 8 +-
proscend/prosrc/webcgi/wanst.c | 227 ++++-----
.../prosrc/www/app/feature/factory_and_reboot.js | 13 +-
proscend/prosrc/www/app/feature/load_factory.js | 11 +-
proscend/prosrc/www/app/feature/login.js | 25 +-
proscend/prosrc/www/app/feature/reboot.js | 11 +-
proscend/prosrc/www/app/feature/restart.js | 11 +-
proscend/prosrc/www/app/feature/serving_cell.js | 11 +-
proscend/prosrc/www/app/services/icos.service.js | 3 +
64 files changed, 1523 insertions(+), 680 deletions(-)
M330 - develop - fix some problem while 'Merge branch 'feature/lighttpd' into develop'
commit f5ee06dc6bbc8205fb5c7eccd3f4f3f23d49568b
Refs: [develop]
Author: jeffrey <[email protected]>
Date: Mon Jul 8 17:03:01 2019 +0800
fix some problem while 'Merge branch 'feature/lighttpd' into develop'
proscend/prosrc/icos/icoslib/web/webcfg.c | 2 +-
proscend/prosrc/icos/script/FirmwareUpgrade.sh | 36 --------------------------
2 files changed, 1 insertion(+), 37 deletions(-)
M330 - develop - no more nginx package
commit 6aaf61fd671327d30a30b4a8b463b6e3fa49db3b
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 17:10:07 2019 +0800
no more nginx package
- thnaks nginx as the temporary solution for HTTPS with iweb
package/proscend/Makefile | 1 -
1 file changed, 1 deletion(-)
build 個 image 試試
暫時沒發現什麼問題
1735
打鐵趁熱
來 merge M360P
M360P - develop - Merge branch 'feature/lighttpd' into develop
commit abc5b38ba30aa7fbb324f645f48bbcc762c23a58
Refs: [develop], {origin/develop}
Merge: fbf3127 2c82963
Author: jeffrey <[email protected]>
Date: Mon Jul 8 17:36:51 2019 +0800
Merge branch 'feature/lighttpd' into develop
m360p_defconfig | 4 +
package/net/lighttpd/Makefile | 327 +++++++++++++
package/net/lighttpd/files/lighttpd.conf | 231 ++++++++++
package/net/lighttpd/files/lighttpd.init | 16 +
proscend/Makefile | 2 +-
proscend/prosrc/icos/icoslib/web/webcfg.c | 172 +++++--
proscend/prosrc/icos/script/FirmwareProgress.sh | 1 -
proscend/prosrc/icos/script/FirmwareUpgrade.sh | 2 +-
proscend/prosrc/icos/script/web_x509_lighttpd.sh | 5 +
proscend/prosrc/webcgi/Makefile | 9 +-
proscend/prosrc/webcgi/alarm.c | 76 ++-
proscend/prosrc/webcgi/api.c | 54 +++
proscend/prosrc/webcgi/bgp.c | 8 +-
proscend/prosrc/webcgi/configuration.c | 8 +-
proscend/prosrc/webcgi/cwmp.c | 8 +-
proscend/prosrc/webcgi/dhcp_client_list.c | 6 +-
proscend/prosrc/webcgi/dmz.c | 212 ++++-----
proscend/prosrc/webcgi/dnat.c | 8 +-
proscend/prosrc/webcgi/dns.c | 41 +-
proscend/prosrc/webcgi/firewall.c | 8 +-
proscend/prosrc/webcgi/firmware.c | 11 +-
proscend/prosrc/webcgi/gre.c | 8 +-
proscend/prosrc/webcgi/icos_config.c | 8 +-
proscend/prosrc/webcgi/ip_alias.c | 8 +-
proscend/prosrc/webcgi/ipfilter.c | 6 +-
proscend/prosrc/webcgi/ipsec.c | 19 +-
proscend/prosrc/webcgi/ipv6lan.c | 12 +-
proscend/prosrc/webcgi/jweb.c | 513 ++++++++++++++++++++-
proscend/prosrc/webcgi/jweb.h | 88 +++-
proscend/prosrc/webcgi/l2tp.c | 8 +-
proscend/prosrc/webcgi/lan_control.c | 10 +-
proscend/prosrc/webcgi/lte.c | 62 +--
proscend/prosrc/webcgi/macfilter.c | 6 +-
proscend/prosrc/webcgi/pptpd.c | 8 +-
proscend/prosrc/webcgi/qos.c | 10 +-
proscend/prosrc/webcgi/route.c | 15 +-
proscend/prosrc/webcgi/schedule_reboot.c | 8 +-
proscend/prosrc/webcgi/smtp.c | 8 +-
proscend/prosrc/webcgi/snat.c | 8 +-
proscend/prosrc/webcgi/snmp.c | 6 +-
proscend/prosrc/webcgi/sntp.c | 8 +-
proscend/prosrc/webcgi/ssh.c | 8 +-
proscend/prosrc/webcgi/switch.c | 12 +-
proscend/prosrc/webcgi/syslog.c | 17 +-
proscend/prosrc/webcgi/system.c | 8 +-
proscend/prosrc/webcgi/urlfilter.c | 6 +-
proscend/prosrc/webcgi/usage_display.c | 16 +-
proscend/prosrc/webcgi/vlan.c | 10 +-
proscend/prosrc/webcgi/vlan_lan_control.c | 10 +-
proscend/prosrc/webcgi/vrrp.c | 8 +-
.../prosrc/www/app/feature/factory_and_reboot.js | 13 +-
proscend/prosrc/www/app/feature/load_factory.js | 11 +-
proscend/prosrc/www/app/feature/lock_pcis.js | 11 +-
proscend/prosrc/www/app/feature/reboot.js | 11 +-
proscend/prosrc/www/app/feature/restart.js | 11 +-
.../prosrc/www/app/feature/search_operators.js | 11 +-
proscend/prosrc/www/app/feature/serving_cell.js | 11 +-
proscend/prosrc/www/app/services/icos.service.js | 3 +
58 files changed, 1822 insertions(+), 383 deletions(-)
M360P - develop - no more nginx package
commit 0b2d7798968cf6247cd5a2ae2c838f18babf0d30
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Mon Jul 8 17:45:09 2019 +0800
no more nginx package
- thnaks nginx as the temporary solution for HTTPS with iweb
package/proscend/Makefile | 1 -
1 file changed, 1 deletion(-)
build image
目前沒看到什麼問題