20200226_jeffrey - silenceuncrio/diary GitHub Wiki

0900

review

M350-C(SDK6.11) - task - [0%] P1 - release v0.01

使用 jubuntu

m350[develop]

Vendor/Products = CTCU/0_CTCU

燒最新的 image

盤一下 online manual

commit 321a1799147a706d0e4dec035b1af48758afa372
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Wed Feb 26 09:56:49 2020 +0800

    online manual - remove 'SIM Slot' information from 'status' section
    - also remove it from top banner of each customer

 proscend/prosrc/www/brand_ctcu/src/brand/top.html.src        | 4 ----
 proscend/prosrc/www/brand_hytec/src/brand/top.html.src       | 4 ----
 proscend/prosrc/www/brand_hytec_korea/src/brand/top.html.src | 4 ----
 proscend/prosrc/www/brand_nobrand/src/brand/top.html.src     | 4 ----
 proscend/prosrc/www/brand_proscend/src/brand/top.html.src    | 4 ----
 proscend/prosrc/www/src/manual/status.h.html                 | 4 ----
 6 files changed, 24 deletions(-)

commit 72568764ff68ab37c08a69fa58b4179dc9fe7f10
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Wed Feb 26 10:05:49 2020 +0800

    change wording from 'System > Ethernet Ports' to 'System > Ethernet'
    - menu
    - online manual

 proscend/prosrc/www/app/locale-en.json                      | 2 +-
 proscend/prosrc/www/app/locale-fr.json                      | 2 +-
 proscend/prosrc/www/src/manual/sidebar.h.html               | 2 +-
 proscend/prosrc/www/src/manual/system_ethernet_ports.h.html | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

commit 8d6fdec08172b948b7061448b6a8d05f6d07471e
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Wed Feb 26 10:18:41 2020 +0800

    online manual - display 'WAN/LAN2 Port Function' according to compile flag PROSRC_ETH_WAN_AS_LAN

 proscend/prosrc/www/src/manual/system_ethernet_ports.h.html | 4 ++++
 1 file changed, 4 insertions(+)

1030

M350 的 vlan web ui 只有 2 個 port

跟 module 負責人協調一下

commit b483b2f7871c85dddf17ab821f3a7ec53c51d903
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Wed Feb 26 10:40:01 2020 +0800

    remove 'LAN > VLAN' and 'LAN > Subnet'
    - do not use compile flag PROSRC_VLAN_GROUP and PROSRC_VLAN since the dependency issue take more times

 proscend/prosrc/www/src/manual.html.src       | 2 --
 proscend/prosrc/www/src/manual/sidebar.h.html | 6 ------
 proscend/prosrc/www/src/menu.html.src         | 4 ----
 3 files changed, 12 deletions(-)

1110

M350 自己負責的幾個功能都還沒測就要放出去了

IP Routing > RIP
IP Routing > OSPF
IP Routing > BGP
VPN > PPTP Server
Firewall > DMZ
Service > VRRP
Diagnosis > Ping
Diagnosis > Traceroute

這兩天盡量測一下不然下個月初就要 release 出去了

1115

M350-C(SDK6.11) - task - [0%] P1 - function test - - Diagnosis > Ping

簡單 ping 自己 lan 端的 PC

PASS

M350-C(SDK6.11) - task - [0%] P1 - function test - - Diagnosis > Traceroute

簡單 traceroute 自己 lan 端的 PC

PASS

M350-C(SDK6.11) - task - [0%] P1 - function test - - IP Routing > RIP

跟 M330 對測一下

PASS

M350-C(SDK6.11) - task - [0%] P1 - function test - - IP Routing > OSPF

ospfd 沒有 build 進去 M350

比較 M330_defconfig 和 M350_defconfig 發現

M350_defconfig

# CONFIG_PACKAGE_quagga-ospfd is not set
# CONFIG_PACKAGE_quagga-bgpd is not set

打開吧

proscend 外層再次 make

1300

換 proscend 內層

透過 web 作 upgrade

1320

M350-C(SDK6.11) - task - [100%] P1 - function test - - IP Routing > OSPF

跟 M330 對測 - PASS

M350-C(SDK6.11) - task - [0%] - [0%] P1 - function test - - IP Routing > BGP

跟 M330 對測 - PASS

先上 code

commit b419c6bbd1b0e6c995412d39b7d5dad88ff9656c
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Wed Feb 26 13:28:48 2020 +0800

    build ospfd and bgpd into rootfs

 M350_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

1340

M350-C(SDK6.11) - task - [100%] P1 - function test - - VPN > PPTP Server

與 PC 對測 - PASS

M350-C(SDK6.11) - task - [0%] P1 - function test - - Firewall > DMZ

怎麼測呢?

觀察到設定後有建出 iptables rule 在

root@ICR-401:/home/admin# iptables -t nat -L DmzPreRouting
Chain DmzPreRouting (1 references)
target     prot opt source               destination
DNAT       tcp  --  anywhere             anywhere             mark match 0x40000000/0x40000000 to:10.1.1.100
DNAT       udp  --  anywhere             anywhere             mark match 0x40000000/0x40000000 to:10.1.1.100

就這樣算 PASS 了

有時間再請教 john 怎麼來測這樣的 iptables rule

M350-C(SDK6.11) - task - [0%] P1 - function test - - Service > VRRP

參考以下 wikis 作測試

測試 PASS

M350-C(SDK6.11) - task - [100%] P1 - update release note - add my part accordingly.

diff --git a/M350-C-ReleaseNotes.txt b/M350-C-ReleaseNotes.txt
old mode 100755
new mode 100644
index 5e70383..232ef7e
--- a/M350-C-ReleaseNotes.txt
+++ b/M350-C-ReleaseNotes.txt
@@ -52,8 +52,10 @@ Proscend M350-C Nobrand  2020200302 Release Notes:
    * Firewall
    * VLAN
    * Dual Image
+   * RIP^M
+   * OSPF^M
    * BGP
-   * PPTP
+   * PPTP Server^M
    * GRE
    * Factory Reset button
    * IPS
diff --git a/M350-C-ReleaseNotes_CTCU.txt b/M350-C-ReleaseNotes_CTCU.txt
old mode 100755
new mode 100644
index 89a9d70..8cc728a
--- a/M350-C-ReleaseNotes_CTCU.txt
+++ b/M350-C-ReleaseNotes_CTCU.txt
@@ -52,8 +52,10 @@ Proscend M350-C Nobrand  2020200302 Release Notes:
    * Firewall
    * VLAN
    * Dual Image
+   * RIP^M
+   * OSPF^M
    * BGP
-   * PPTP
+   * PPTP Server^M
    * GRE
    * Factory Reset button
    * IPS

1430

M350-C(SDK6.11) - bug - web ui - bgp general 少了 redistribute rip 和 ospf 的設定項

commit 08c5984d000f01eda85d76af382801b183d06cda
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Wed Feb 26 14:29:34 2020 +0800

    add 2 more field at online manual for 'IP Routing > BGP' page

 proscend/prosrc/www/src/manual/ip_routing_bgp.h.html | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit 65a9d4649edcababcce1f433d288bb8395f3122f
Author: jeffrey <[email protected]>
Date:   Wed Feb 26 14:25:18 2020 +0800

    add 2 more field at 'Generic' tab of 'IP Routing > BGP' page

 proscend/prosrc/www/app/feature/bgp.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

1440

M350-C(SDK6.11) - bug - [0%] firmware upgrade 時 web.log 會被 lighttpd 本身這個 process 塞爆

commit 84ae816733f01d1b87f1c195e33121cc2a2637c3
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Wed Feb 26 14:49:45 2020 +0800

    no more proc_msg_cb needed at web module
    - or the web.log will be full of the message from lighttpd

 proscend/prosrc/icos/icoslib/web/webcfg.c | 1 -
 1 file changed, 1 deletion(-)

搞定

1500

M330 - bug - online manual - SIM Slot 要從 status 的 Title Bar 拿掉

使用 VMware jjbox

m330(release/v1.00)

Vendor/Products = GENERIC/1_GENERIC_WIFI

commit ca574e52fbda7b3ba1296d3f7ac6f67d2955c97a
Refs: [release/v1.00], {origin/release/v1.00}
Author: jeffrey <[email protected]>
Date:   Wed Feb 26 15:24:04 2020 +0800

    online manual - remove 'SIM Slot' information from 'status' section
    - also remove it from top banner of each customer

 proscend/prosrc/www/brand_advice/src/brand/top.html.src      | 2 --
 proscend/prosrc/www/brand_allnet/src/brand/top.html.src      | 4 ----
 proscend/prosrc/www/brand_ctcu/src/brand/top.html.src        | 4 ----
 proscend/prosrc/www/brand_hytec/src/brand/top.html.src       | 4 ----
 proscend/prosrc/www/brand_hytec_korea/src/brand/top.html.src | 4 ----
 proscend/prosrc/www/brand_nobrand/src/brand/top.html.src     | 4 ----
 proscend/prosrc/www/brand_proscend/src/brand/top.html.src    | 4 ----
 proscend/prosrc/www/src/manual/status.h.html                 | 4 ----
 8 files changed, 30 deletions(-)

M330 - bug - [100%] generic 版本的 online manual 還是出現 APN2 字眼 - 例如 Status > LTE APN1 / LTE APN2

commit bf8b6debda83a04f3ed7052e1176e3242b6fcf8e
Refs: [release/v1.00], {origin/release/v1.00}
Author: jeffrey <[email protected]>
Date:   Wed Feb 26 15:41:03 2020 +0800

    display 'APN2' accordingly on online manual

    for ex:

    if defined(PROSRC_LTE_BRIDGE_ROUTER) || defined(PROSRC_LTE_ROUTER_ROUTER)
    <h4>Status > LTE APN1 / LTE APN2</h4>
    else
    <h4>Status > LTE APN1</h4>
    endif

 proscend/prosrc/www/src/manual/lte_dns.h.html |  4 ----
 proscend/prosrc/www/src/manual/status.h.html  | 10 +++++++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

結案

1555

commit e0aeb68c5fa5b1cc5aab2c3ef1d33c5f26973b97
Refs: [release/v1.00], {origin/release/v1.00}
Author: jeffrey <[email protected]>
Date:   Wed Feb 26 15:55:48 2020 +0800

    at online manual 'WAN > Priority', display 'Priority' and 'Connect Order' accordingly

 proscend/prosrc/www/src/manual/wan_priority.h.html | 65 +++++++++++++++++++---
 1 file changed, 58 insertions(+), 7 deletions(-)

1600

M330 - issue - 0000911: change dhcp to pppoe, M330 ETH can get ip from ISP, but pc can not access internet

commit 42b8dcd1a97f83b195fe3325819e2777a6b981fb
Refs: [release/v1.00], {origin/release/v1.00}
Author: jeffrey <[email protected]>
Date:   Wed Feb 26 16:21:18 2020 +0800

    when user change 'Work As' at 'WAN > Ethernet', ask user to reboot to take effect

 proscend/prosrc/www/app/feature/wanEthernet.js | 59 ++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 3 deletions(-)

1640

從 m330(develop) sync 以下這兩個 commit 過來 m330(release/v1.00)

commit 27c4b97bdbadb80355d7375c8f71699f3f8d43ab
Refs: [release/v1.00], {origin/release/v1.00}
Author: jeffrey <[email protected]>
Date:   Wed Feb 19 15:32:11 2020 +0800

    web session bug

    when
    after login, session timeout not yet

    what
    sometimes multiple concurrent CGI requests will cause a issue
    some cgi will get 401 return and then the browder will redirect to login page

    why
    401 return is cause by we found no match session id

    how(workaround)
    but if we sleep(1) and load_session_store then search again
    we will find the match session id

 proscend/prosrc/webcgi/jweb.c | 62 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 3 deletions(-)

commit ce3ea048d611f652023ff9f744c7c0cae0da1cbb
Author: jeffrey <[email protected]>
Date:   Wed Feb 19 10:00:59 2020 +0800

    output information base on different error

 proscend/prosrc/webcgi/jweb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

這可以解掉 M330 上的一些 issue

M330 - issue

[100%] 0000750: sometimes lost apply button
[100%] 0000661: [login web page] I configure openvpn, but sometimes display login page

build 個 image 來試試

root@Cellular Router:~# tail /home/log/jweb.log -f
1582704831[20200226 08:13:51] [init_session_store:395]load_session_store fail
1582704831[20200226 08:13:51] [get_session:476]jweb.in.session NULL
1582704838[20200226 08:13:58] [get_session:476]jweb.in.session NULL
1582704838[20200226 08:13:58] [get_session:476]jweb.in.session NULL
1582704838[20200226 08:13:58] [get_session:476]jweb.in.session NULL
1582704961[20200226 08:16:01] [get_session:518]no match session found, sleep(1) and try again
1582704961[20200226 08:16:01] [get_session:518]no match session found, sleep(1) and try again
1582704962[20200226 08:16:02] [get_session:537]found session at Session_store[0] after re-load_session_store
1582704962[20200226 08:16:02] [get_session:537]found session at Session_store[0] after re-load_session_store
...

sync 有成功

1715

幫 jubuntu 新增一個 m300.vmdk

參考

目前的 /etc/rc.local

#!/bin/sh -e
#
# rc.local
#
# This script is executed at the end of each multiuser runlevel.
# Make sure that the script will "exit 0" on success or any other
# value on error.
#
# In order to enable or disable this script just change the execution
# bits.
#
# By default this script does nothing.

# mount m300.vmdk
mkdir -p /home/jeffrey/m300
sudo mount UUID="e52bb813-823c-44d5-a917-8134a2488986" /home/jeffrey/m300
# execute once is enough ?
# sudo chown -R jeffrey:jeffrey /home/jeffrey/m300

# mount m350.vmdk
mkdir -p /home/jeffrey/m350
sudo mount UUID="91879702-3fa3-4ce0-8fd4-997381c5d96d" /home/jeffrey/m350
# execute once is enough ?
# sudo chown -R jeffrey:jeffrey /home/jeffrey/m350

# mount m360.vmdk
mkdir -p /home/jeffrey/m360
sudo mount UUID="c0386d28-334c-4729-9e93-669b8515aa27" /home/jeffrey/m360
# execute once is enough ?
# sudo chown -R jeffrey:jeffrey /home/jeffrey/m360

exit 0

Building the Docker image - build-m300

以該 image 來建立 container
進入該 container 來 compile m300

20200226_jeffrey - silenceuncrio/diary GitHub Wiki

0900

1030

1110

1115

1300

1320

1340

1430

1440

1500

1555

1600

1640

1715

⚠️ **GitHub.com Fallback** ⚠️

⚠️ GitHub.com Fallback ⚠️