20190719_jeffrey - silenceuncrio/diary GitHub Wiki

0850

M300 目前有個參加標案的機會

我需要 survey 該標案提到的 GRE 是否有實現的可能性

先就該圖private做個名詞 survey 及列出 google 出處

BRAS - The broadband remote access server
- Broadband Access Aggregation and DSL Configuration Guide, Cisco IOS XE Release 3S
Active-Active
- Active/Active or Active/Standby
GRE tunnel Keep-alive
- GRE Tunnel Keepalives
key 加密
- Tunnel key in PTP GRE tunnel
bundle rate shaping
- 用Traffic Shaping機制即時管理VM網路流量
- Bandwidth Management 頻寬管理

1025

M330[release/v0.05] - fix typo

commit 55438e7dbb6547e8d2f4acadba77c2dfdf3cdec3
Refs: [release/v0.05], {origin/release/v0.05}
Author: jeffrey <[email protected]>
Date:   Fri Jul 19 10:28:18 2019 +0800

    fix typo
    - 'aause' to 'cause'

 proscend/prosrc/www/app/locale-en.json    | 2 +-
 proscend/prosrc/www/app/locale-fr.json    | 2 +-
 proscend/prosrc/www/app/locale-zh-tw.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

1040

幫忙看一下 M330 issue - 0000609: DUT can't accept manual time, especially 1970/01/01 **:**

試著在 M330 - release/v0.05 這個 branch 解決這個問題

diff --git a/proscend/prosrc/www/app/feature/timeAndDate.html b/proscend/prosrc/www/app/feature/timeAndDate.html
index 4261637..66e125a 100644
--- a/proscend/prosrc/www/app/feature/timeAndDate.html
+++ b/proscend/prosrc/www/app/feature/timeAndDate.html
@@ -35,38 +35,57 @@



-  <div class="form-group" ng-show="vm.sntp.mode == 1 && vm.sntp._GPS_time">
-    <label class="col-sm-3 control-label">{{ 'TIMEANDDATE_GPS_TIME' | translate }}</label>
-    <div class="col-sm-9">
-      <label class="radio-inline">
-        <input type="radio" ng-model="vm.sntp.GPS_time" ng-value="0">
-          {{ 'OFF' | translate }}</label>
-      <label class="radio-inline">
-        <input type="radio" ng-model="vm.sntp.GPS_time" ng-value="1">
-          {{ 'ON' | translate }}</label>
-    </div>
-  </div>
-
-
-
-  <div class="form-group" ng-show="vm.sntp.mode == 0">
+  <div class="form-group" ^M
+    ng-class="{ 'has-error': ^M
+      form.manual_year.$invalid || ^M
+      form.manual_month.$invalid || ^M
+      form.manual_day.$invalid || ^M
+      form.manual_hour.$invalid || ^M
+      form.manual_min.$invalid || ^M
+      form.manual_sec.$invalid }" >^M
     <label class="col-sm-3 control-label">YYYY-MM-DD HH:MM:SS</label>
     <div class="col-sm-9 form-inline">
       <input type="number" class="form-control"
-        ng-model="vm.sntp.manual.year" min=2016 max=2100> -
+        ng-disabled="vm.sntp.mode != 0"^M
+        name="manual_year"^M
+        ng-model="vm.sntp.manual.year" min=1970 max=3000> -^M
       <input type="number" class="form-control"
+        ng-disabled="vm.sntp.mode != 0"^M
+        name="manual_month"^M
         ng-model="vm.sntp.manual.month" min=1 max=12> -
       <input type="number" class="form-control"
+        ng-disabled="vm.sntp.mode != 0"^M
+        name="manual_day"^M
         ng-model="vm.sntp.manual.day" min=1 max=31>
       <input type="number" class="form-control"
+        ng-disabled="vm.sntp.mode != 0"^M
+        name="manual_hour"^M
         ng-model="vm.sntp.manual.hour" min=0 max=23> :
       <input type="number" class="form-control"
+        ng-disabled="vm.sntp.mode != 0"^M
+        name="manual_min"^M
         ng-model="vm.sntp.manual.min" min=0 max=59> :
       <input type="number" class="form-control"
+        ng-disabled="vm.sntp.mode != 0"^M
+        name="manual_sec"^M
         ng-model="vm.sntp.manual.sec" min=0 max=59>
     </div>
   </div>

+^M
+^M
+  <div class="form-group" ng-show="vm.sntp.mode == 1 && vm.sntp._GPS_time">^M
+    <label class="col-sm-3 control-label">{{ 'TIMEANDDATE_GPS_TIME' | translate }}</label>^M
+    <div class="col-sm-9">^M
+      <label class="radio-inline">^M
+        <input type="radio" ng-model="vm.sntp.GPS_time" ng-value="0">^M
+          {{ 'OFF' | translate }}</label>^M
+      <label class="radio-inline">^M
+        <input type="radio" ng-model="vm.sntp.GPS_time" ng-value="1">^M
+          {{ 'ON' | translate }}</label>^M
+    </div>^M
+  </div>^M
+^M
   <div class="form-group" ng-show="vm.sntp.mode == 1">
     <label class="col-sm-3 control-label">{{ 'TIMEANDDATE_IPV4_SERVER' | translate }} #1</label>
     <div class="col-sm-9">
@@ -253,7 +272,7 @@
   <div class="panel-footer clearfix">
     <div class="pull-right">
       <button type="submit" class="btn btn-primary"
-        ng-click="vm.apply()" ng-disabled="vm.applying">
+        ng-click="vm.apply()" ng-disabled="form.$invalid || vm.applying">^M
         {{ 'APPLY' | translate }}
         <i class="fa fa-spinner fa-pulse fa-fw" ng-show="vm.applying"></i>
       </button>

M330[release/v0.05] - fix issue - 0000609: DUT can't accept manual time, especially 1970/01/01 :

commit fabd79709e93f866827e7b3fba9c8e57fe3bfd3a
Refs: [release/v0.05], {origin/release/v0.05}
Author: jeffrey <[email protected]>
Date:   Fri Jul 19 11:26:01 2019 +0800

    at 'System > Time and Date', each inputs of 'YYYY-MM-DD HH:MM:SS' filed shoud be valid before user apply
    - or CGI whill get a null 'time' to call settimeofday()
    - highlight the 'YYYY-MM-DD HH:MM:SS' field when any input invalid
    - display bud disabled the 'YYYY-MM-DD HH:MM:SS' field when 'Mode' is 'Get from Time Server'
    - YYYY - min=1970, max=3000

    fix issue - 0000609: DUT can't accept manual time, especially 1970/01/01 **:**

 proscend/prosrc/www/app/feature/timeAndDate.html | 53 ++++++++++++++++--------
 1 file changed, 36 insertions(+), 17 deletions(-)

1445

回到早上的這張圖

這張圖是 CTCU 從 Hinet 拿到的

具體的案子並不是用 M300

而是未來的 M350

但目前可以先在 M300 做實驗

透過 CTCU 我們可以跟 Hinet 做更細節的討論

不過我們自己需要先花點時間做做功課

像我現在就可以很清楚的規畫出未來一個月的目標

從 M300[develop] 建一個 branch 供這個案子做實驗
兩台 M300
- wan ethernet 互相建一個 GRE tunnel
- LTE 互相建一個 GRE tunnel
  - spring 表示 Hinet 可以藉我們 public ip 的 SIM 卡兩張
GRE 加上 key 的支援
keep alive 可以放後面一點再做
- 可以花時間參考 Cisco 的作法
有了兩個 interface 之後 john 就可來發揮跟 QoS 相關的部分了

1515

回頭顧基本盤 - M330[develop] - fota web ui

Vendor/Products = GENERIC/0_GENERIC

記得打開 FOTA 功能選項 - 目前所有的 profile 都沒有開啟該功能

 PROSCEND Software Configuration
 ──────────────────────────────────────────────────────────────────────────────
  ┌───────────────────────────── Applications ──────────────────────────────┐
  │  Arrow keys navigate the menu.  <Enter> selects submenus --->.          │
  │  Highlighted letters are hotkeys.  Pressing <Y> includes, <N> excludes, │
  │  <M> modularizes features.  Press <Esc><Esc> to exit, <?> for Help.     │
  │  Legend: [*] built-in  [ ] excluded  <M> module  < > module capable     │
  │ ┌───────────────^(-)──────────────────────────────────────────────────┐ │
  │ │               [*] DDNS (v4,v6)                                      │ │
  │ │               [ ] IGMP Proxy (v4,v6)                                │ │
  │ │               [*] System Log (v4,v6)                                │ │
  │ │               [*] FOTA                                              │ │
  │ │               [*] UPnP IGD (v4,v6)                                  │ │
  │ │               [*] Firewall                                          │ │
  │ │               [*] URL Filter                                        │ │
  │ │               [*] IP Filter                                         │ │
  │ │               [*] MAC Filter                                        │ │
  │ └───────────────┴(+)──────────────────────────────────────────────────┘ │
  ├─────────────────────────────────────────────────────────────────────────┤
  │                    <Select>    < Exit >    < Help >                     │
  └─────────────────────────────────────────────────────────────────────────┘

發現 PROSRC_FOTAD 還是沒打開

user@3b95631f73fe:~/proscend$ cat .config | grep FOTA
# PROSRC_FOTAD is not set
PROSRC_FOTAD_FWINFO_XML=""
user@3b95631f73fe:~/proscend$

原來是 Config.in 裡的 FOTA 讓人誤會

➜  m330 git:(develop) ✗ cd proscend/mconfig
➜  mconfig git:(develop) ✗ grep -r "FOTA"
Config.in:bool 'FOTA' PROSRC_FW_UPDATE
Config.in:bool 'FOTAD (Firmware Over the Air)' PROSRC_FOTAD
Config.in:string 'Fota server XML list' PROSRC_FOTAD_FWINFO_XML $PROSRC_FOTAD_FWINFO_XML
autoconf.h:#undef  PROSRC_FOTAD
autoconf.h:#define PROSRC_FOTAD_FWINFO_XML ""
configs/GENERIC/0_GENERIC/defconfig:# PROSRC_FOTAD is not set
configs/GENERIC/0_GENERIC/defconfig:PROSRC_FOTAD_FWINFO_XML=""
configs/GENERIC/1_GENERIC_WIFI/defconfig:# PROSRC_FOTAD is not set
configs/GENERIC/1_GENERIC_WIFI/defconfig:PROSRC_FOTAD_FWINFO_XML="ftp://fotaServer:[email protected]:2121/fota_firmware.xml ftp://60.250.198.239:2121/fota_firmware.xml http://192.168.0.97/proscend/fota_firmware.xml http://proscend:[email protected]/secured/proscend/fota_firmware.xml"
configs/GENERIC/2_GENERIC_BG96/defconfig:# PROSRC_FOTAD is not set
configs/GENERIC/2_GENERIC_BG96/defconfig:PROSRC_FOTAD_FWINFO_XML=""
configs/MANUFACTURE/0_MANUFACTURE/defconfig:# PROSRC_FOTAD is not set
configs/MANUFACTURE/0_MANUFACTURE/defconfig:PROSRC_FOTAD_FWINFO_XML=""
configs/CTCU/0_CTCU/defconfig:# PROSRC_FOTAD is not set
configs/CTCU/0_CTCU/defconfig:PROSRC_FOTAD_FWINFO_XML=""
configs/CTCU/1_CTCU_WIFI/defconfig:# PROSRC_FOTAD is not set
configs/CTCU/1_CTCU_WIFI/defconfig:PROSRC_FOTAD_FWINFO_XML=""
configs/PI/0_PI_WIFI/defconfig:# PROSRC_FOTAD is not set
configs/PI/0_PI_WIFI/defconfig:PROSRC_FOTAD_FWINFO_XML=""
configs/HYTEC/1_HYTEC_WIFI/defconfig:# PROSRC_FOTAD is not set
configs/HYTEC/1_HYTEC_WIFI/defconfig:PROSRC_FOTAD_FWINFO_XML=""
configs/HYTEC/0_HYTEC/defconfig:# PROSRC_FOTAD is not set
configs/HYTEC/0_HYTEC/defconfig:PROSRC_FOTAD_FWINFO_XML=""
.config.old:# PROSRC_FOTAD is not set
.config.old:PROSRC_FOTAD_FWINFO_XML=""
.config:# PROSRC_FOTAD is not set
.config:PROSRC_FOTAD_FWINFO_XML=""

這個 bool 'FOTA' PROSRC_FW_UPDATE 從 M330 最一開始的 commit 就有了

幫忙刪掉以免其他同仁跟我一樣誤會

diff --git a/proscend/mconfig/Config.in b/proscend/mconfig/Config.in
index ff90f11..8760162 100755
--- a/proscend/mconfig/Config.in
+++ b/proscend/mconfig/Config.in
@@ -187,7 +187,6 @@ bool 'DDNS (v4,v6)' PROSRC_DDNSD
 bool 'IGMP Proxy (v4,v6)' PROSRC_IGMPPROXY

 bool 'System Log (v4,v6)' PROSRC_LOGS
-bool 'FOTA' PROSRC_FW_UPDATE
 bool 'UPnP IGD (v4,v6)' PROSRC_UPNP_IGD

 bool 'Firewall' PROSRC_FIREWALL

真正要選擇的是 FOTAD (Firmware Over the Air) 這個選項

 PROSCEND Software Configuration
 ──────────────────────────────────────────────────────────────────────────────
  ┌───────────────────────────── Applications ──────────────────────────────┐
  │  Arrow keys navigate the menu.  <Enter> selects submenus --->.          │
  │  Highlighted letters are hotkeys.  Pressing <Y> includes, <N> excludes, │
  │  <M> modularizes features.  Press <Esc><Esc> to exit, <?> for Help.     │
  │  Legend: [*] built-in  [ ] excluded  <M> module  < > module capable     │
  │ ┌───────────────^(-)──────────────────────────────────────────────────┐ │
  │ │               [ ] CPU Temperature                                   │ │
  │ │               [ ] LTE_DATA_ALARM                                    │ │
  │ │               [*] ETH WAN as LAN                                    │ │
  │ │               [ ] LTE_BRIDGE_ROUTER                                 │ │
  │ │               [ ] LTE_ROUTER_ROUTER                                 │ │
  │ │               [ ] LTE IOT                                           │ │
  │ │               [*] LTE USSD                                          │ │
  │ │               [*] FOTAD (Firmware Over the Air)                     │ │
  │ │                    Fota server XML list: "" (NEW)                   │ │
  │ └─────────────────────────────────────────────────────────────────────┘ │
  ├─────────────────────────────────────────────────────────────────────────┤
  │                    <Select>    < Exit >    < Help >                     │
  └─────────────────────────────────────────────────────────────────────────┘

此時選項 PROSRC_FOTAD 已被開啟

user@3b95631f73fe:~/proscend$ cat .config | grep FOTA
PROSRC_FOTAD=y
PROSRC_FOTAD_FWINFO_XML=""

M330[develop] - remove bool 'FOTA' PROSRC_FW_UPDATE since the real one is bool 'FOTAD (Firmware Over the Air)' PROSRC_FOTAD

commit 026aefdd6955c2b76d936b498a9a1dd900a4fad6
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Fri Jul 19 15:40:13 2019 +0800

    remove `bool 'FOTA' PROSRC_FW_UPDATE` since the real one is `bool 'FOTAD (Firmware Over the Air)' PROSRC_FOTAD`

 proscend/mconfig/Config.in | 1 -
 1 file changed, 1 deletion(-)

1550

compile error

home/user/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/lib icospromsg.o -o icospromsg -licos -lcrypt -lpthread -lutil -lm -ljson-c  -lcurl  -lpolarssl -largp -lunqlite -lssdk_us_km
/home/user/proscend/rootfs/usr/lib/libicos.so: undefined reference to `GetPIDbyName'
collect2: ld returned 1 exit status
make[3]: *** [default] Error 1
make[3]: Leaving directory `/home/user/proscend/prosrc/icos/promsg'
make[2]: *** [default] Error 2
make[2]: Leaving directory `/home/user/proscend/prosrc/icos'
make[1]: *** [icos] Error 2
make[1]: Leaving directory `/home/user/proscend/prosrc'
make: *** [prosrc] Error 2
user@3b95631f73fe:~/proscend$ cat .config | grep WIFI
# PROSRC_WIFI_APSTA is not set
PROSRC_WIFI_APSSID=""
PROSRC_WIFI_APPASSWORD=""
# PROSRC_WIFI_STA is not set
user@3b95631f73fe:~/proscend$

這是因為 GENERIC/0_GENERIC 這 profile 沒定義 PROSRC_WIFI_APSTA 的關係

所以 icoslib 並不會去 build icoslib/wifi_ap

ifeq ($(PROSRC_WIFI_APSTA),y)
SUBLIBS  += wifi_ap/wifi_ap.a
endif

但 GetPIDbyName() 就存在 icoslib/wifi_ap 裡

寫 mail 跟 jessy 說一下

自己先換個 profile 吧 - 1_GENERIC_WIFI

user@3b95631f73fe:~/proscend$ cat .config | grep WIFI_APSTA
PROSRC_WIFI_APSTA=y
user@3b95631f73fe:~/proscend$ cat .config | grep FOTAD
PROSRC_FOTAD=y
PROSRC_FOTAD_FWINFO_XML="ftp://fotaServer:[email protected]:2121/fota_firmware.xml ftp://60.250.198.239:2121/fota_firmware.xml http://192.168.0.97/proscend/fota_firmware.xml http://proscend:[email protected]/secured/proscend/fota_firmware.xml"
user@3b95631f73fe:~/proscend$

1630

第一步

M330[develop] - add fota.cgi for icos MODULE_FOTA

commit d4ea4e3e5d55027150d749a2245de6928e9dd188
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Fri Jul 19 16:29:03 2019 +0800

    add fota.cgi for icos MODULE_FOTA:
    - /cgi-bin/fota.cgi?act=config

 proscend/prosrc/webcgi/Makefile |   3 +
 proscend/prosrc/webcgi/fota.c   | 125 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+)

M330[develop] - add 'Management > FOTA' web page: first step

commit 0c83b307c13cff69ba2fec81a7aa91e328d70c97
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date:   Fri Jul 19 17:33:41 2019 +0800

    add 'Management > FOTA' web page: first step
    - only display 'vm.config' with <pre>

 proscend/prosrc/www/app/feature/fota.html          | 36 ++++++++++++++++++
 proscend/prosrc/www/app/feature/fota.js            | 44 ++++++++++++++++++++++
 proscend/prosrc/www/app/locale-en.json             |  9 +++++
 proscend/prosrc/www/app/locale-fr.json             |  9 +++++
 proscend/prosrc/www/app/locale-zh-tw.json          |  9 +++++
 proscend/prosrc/www/app/services/icos.service.js   |  8 ++++
 proscend/prosrc/www/src/index.html.src             |  1 +
 proscend/prosrc/www/src/manual.html.src            |  3 ++
 .../prosrc/www/src/manual/management_fota.h.html   | 13 +++++++
 proscend/prosrc/www/src/manual/sidebar.h.html      |  3 ++
 proscend/prosrc/www/src/menu.html.src              |  3 ++
 11 files changed, 138 insertions(+)