20200503_jeffrey - silenceuncrio/diary GitHub Wiki

0900

M350-C - issue - [0%] 1062: Use Keepalive field display at non offered profile (CID 0012)

commit 18c59f9b85651d984d14cf3f2e0c7112736f35c9
Refs: [release/v0.04], {origin/release/v0.04}
Author: jeffrey <[email protected]>
Date:   Wed Jun 3 09:50:41 2020 +0800

    'Use Keepalive' field only display at offered profile

 proscend/prosrc/www/app/feature/gre_3g_edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

0950

M350-C - issue - [0%] 1061: GRE2 interface down, but log display up

找到原因了

這是因為從 javascript 端使用 hard code 的 interface name 所導致

gre_3g.js

  vm.help.interface_options = [
    {val: 'eth1', label: 'WAN Ethernet'}, 
    {val: 'eth2', label: 'LTE APN1'}, 
    {val: 'lan', label: 'lan'}
  ];

目前 M350-C 導入 QMAP 後 APN1/2 的 interface name 已經改變了

我應該換個寫法

先把 web ui 有 hard code 的部分找出來

➜  feature git:(release/v0.04) ✗ grep -r interface_options
ospf_2g.html:            ng-options="x.val as x.label for x in vm.help.interface_options"></select>
rip_2g.js:    vm.help.interface_options = [{val: 'eth1', label: 'eth1(WAN Ethernet)'}, {val: 'lan', label: 'lan'}];
rip_2g.html:            ng-options="x.val as x.label for x in vm.help.interface_options"></select>
ip_alias.html:          ng-options="x.val as x.label for x in vm.help.interface_options"></select>
ospf_2g.js:    vm.help.interface_options = [{val: 'eth1', label: 'eth1'}, {val: 'lan', label: 'lan'}];
gre_3g_edit.html:        ng-options="x.val as x.label for x in vm.help.interface_options"></select>
gre_3g.js:  vm.help.interface_options = [
ip_alias.js:    vm.help.interface_options = [];
ip_alias.js:            vm.help.interface_options.push({val: 'eth1', label: 'eth1(LTE APN1)'});
ip_alias.js:            vm.help.interface_options.push({val: 'eth2', label: 'eth2(LTE)'});
ip_alias.js:            vm.help.interface_options.push({val: 'ppp800', label: 'ppp800(LTE APN2)'});
ip_alias.js:        vm.help.interface_options.push({val: vm.status.devices[i], label: vm.status.devices[i]});
ip_alias.js:    vm.help.interface_options.push({val: "lo", label: "lo(Loopback)"});

先解 gre_3g

commit 8fe22279f3a80b968af9b999af3c402b73b72407
Refs: [release/v0.04], {origin/release/v0.04}
Author: jeffrey <[email protected]>
Date:   Wed Jun 3 13:36:58 2020 +0800

    no more hardcoded interface options at 'Device' field at 'VPN > GRE'

 proscend/prosrc/icos/icoslib/utility/icos_utility.c | 20 ++++++++++++++++++++
 proscend/prosrc/icos/include/icos_utility.h         |  1 +
 proscend/prosrc/webcgi/icos_iface.c                 |  9 +++++++++
 proscend/prosrc/www/app/feature/gre_3g.js           | 15 +++++++--------
 proscend/prosrc/www/app/feature/gre_3g_edit.html    |  2 +-
 proscend/prosrc/www/app/services/icos.service.js    |  5 +++++
 6 files changed, 43 insertions(+), 9 deletions(-)

1340

M330 - issue - [0%] 1065: hard coding interface options is danger

commit 3cdb95276968cd3ce4e1353f6522c1489c6184f6
Refs: [release/v1.02]
Author: jeffrey <[email protected]>
Date:   Wed Jun 3 14:19:16 2020 +0800

    refactoring
    - ICOS_GetEcmpIfaces(): common part reused

 .../prosrc/icos/icoslib/utility/icos_utility.c     | 42 +++++++++++++---------
 1 file changed, 25 insertions(+), 17 deletions(-)

commit 4164c4e17c1fed453a2b749b3f2a2c965c36e299
Refs: [release/v1.02]
Author: jeffrey <[email protected]>
Date:   Wed Jun 3 14:40:33 2020 +0800

    no more hardcoded interface options at 'Device' field at 'VPN > GRE'

 proscend/prosrc/icos/icoslib/utility/icos_utility.c | 16 ++++++++++++++++
 proscend/prosrc/icos/include/icos_utility.h         |  1 +
 proscend/prosrc/webcgi/icos_iface.c                 |  9 +++++++++
 proscend/prosrc/www/app/feature/gre_3g.js           | 15 +++++++--------
 proscend/prosrc/www/app/feature/gre_3g_edit.html    |  2 +-
 proscend/prosrc/www/app/services/icos.service.js    |  5 +++++
 6 files changed, 39 insertions(+), 9 deletions(-)

commit 3444af1a38d064eca4b69fda2154f00c09e76cc2
Refs: [release/v1.02]
Author: jeffrey <[email protected]>
Date:   Wed Jun 3 15:04:43 2020 +0800

    no more hardcoded interface options at 'Device' field at 'Service > IP Alias'

 .../prosrc/icos/icoslib/utility/icos_utility.c     | 15 ++++++++++
 proscend/prosrc/icos/include/icos_utility.h        |  1 +
 proscend/prosrc/webcgi/icos_iface.c                |  9 ++++++
 proscend/prosrc/www/app/feature/ip_alias.html      |  2 +-
 proscend/prosrc/www/app/feature/ip_alias.js        | 32 +++++-----------------
 proscend/prosrc/www/app/services/icos.service.js   |  5 ++++
 6 files changed, 38 insertions(+), 26 deletions(-)

commit 96e91866905029e0610a1c7b168323a0578a444d
Refs: [release/v1.02]
Author: jeffrey <[email protected]>
Date:   Wed Jun 3 15:52:39 2020 +0800

    no more hardcoded interface options at 'Use Interface' field at 'Diagnosis > Ping' and 'Diagnosis > Traceroute'

 proscend/prosrc/icos/icoslib/utility/icos_utility.c     | 12 ++++++++++++
 proscend/prosrc/icos/include/icos_utility.h             |  1 +
 proscend/prosrc/webcgi/icos_iface.c                     |  9 +++++++++
 proscend/prosrc/www/app/feature/ping.js                 | 10 ++++++++--
 proscend/prosrc/www/app/feature/traceroute.js           | 10 ++++++++--
 proscend/prosrc/www/app/services/icos.service.js        |  5 +++++
 proscend/prosrc/www/src/app/feature/ping.html.src       |  6 ++----
 proscend/prosrc/www/src/app/feature/traceroute.html.src |  6 ++----
 8 files changed, 47 insertions(+), 12 deletions(-)

commit 66362cc14c9de3369bfa07c9dc95b929b5d68b61
Refs: [release/v1.02]
Author: jeffrey <[email protected]>
Date:   Wed Jun 3 16:21:15 2020 +0800

    no more hardcoded interface options at 'Interface' field at 'IP Routing > RIP'

 proscend/prosrc/icos/icoslib/utility/icos_utility.c | 12 ++++++++++++
 proscend/prosrc/icos/include/icos_utility.h         |  1 +
 proscend/prosrc/webcgi/icos_iface.c                 |  9 +++++++++
 proscend/prosrc/www/app/feature/rip_2g.html         |  2 +-
 proscend/prosrc/www/app/feature/rip_2g.js           | 13 +++++++++----
 proscend/prosrc/www/app/services/icos.service.js    |  5 +++++
 6 files changed, 37 insertions(+), 5 deletions(-)

commit d3187a50345999f0ee75aaf231cdbc9fc8f2db2f
Refs: [release/v1.02]
Author: jeffrey <[email protected]>
Date:   Wed Jun 3 16:34:32 2020 +0800

    no more hardcoded interface options at 'Interface' field at 'IP Routing > OSPF'

 .../prosrc/icos/icoslib/utility/icos_utility.c     | 12 +++++++++++
 proscend/prosrc/icos/include/icos_utility.h        |  1 +
 proscend/prosrc/webcgi/icos_iface.c                |  9 ++++++++
 proscend/prosrc/www/app/feature/ospf_2g.html       |  2 +-
 proscend/prosrc/www/app/feature/ospf_2g.js         | 25 ++++++++++++----------
 proscend/prosrc/www/app/services/icos.service.js   |  5 +++++
 6 files changed, 42 insertions(+), 12 deletions(-)

1635

臨時需求

commit 6d354654a9f92ab995ef5b2b52218a927d12525e
Refs: [release/v1.02], {origin/release/v1.02}
Author: jeffrey <[email protected]>
Date:   Wed Jun 3 16:56:05 2020 +0800

    let 'Connect Action' base on both apn status

 proscend/prosrc/webcgi/icos_shm.c                 | 17 +++++++++++++++++
 proscend/prosrc/www/app/feature/dualSim_2apn.html |  6 ++++--
 proscend/prosrc/www/app/feature/dualSim_2apn.js   | 20 +++++++++++++++-----
 proscend/prosrc/www/app/services/icos.service.js  |  3 +++
 4 files changed, 39 insertions(+), 7 deletions(-)

1730

M350-C - issue - [0%] 1063: hard coding interface options is danger

commit 3ee9b611097d7003cde1ef3644c2da9a1f8a6e22
Author: jeffrey <[email protected]>
Date:   Wed Jun 3 17:32:06 2020 +0800

    no more hardcoded interface options at 'Device' field at 'Service > IP Alias'

 .../prosrc/icos/icoslib/utility/icos_utility.c     | 13 +++++++++
 proscend/prosrc/icos/include/icos_utility.h        |  2 ++
 proscend/prosrc/webcgi/icos_iface.c                |  9 ++++++
 proscend/prosrc/www/app/feature/ip_alias.html      |  2 +-
 proscend/prosrc/www/app/feature/ip_alias.js        | 32 +++++-----------------
 proscend/prosrc/www/app/services/icos.service.js   |  5 ++++
 6 files changed, 37 insertions(+), 26 deletions(-)

commit 51c20351810385111d48423df626d9c3b0fc89f3
Refs: [release/v0.04], {origin/release/v0.04}
Author: jeffrey <[email protected]>
Date:   Wed Jun 3 17:46:59 2020 +0800

    no more hardcoded interface options at 'Use Interface' field at 'Diagnosis > Ping' and 'Diagnosis > Traceroute'

 proscend/prosrc/icos/icoslib/utility/icos_utility.c     | 10 ++++++++++
 proscend/prosrc/icos/include/icos_utility.h             |  1 +
 proscend/prosrc/webcgi/icos_iface.c                     | 11 ++++++++++-
 proscend/prosrc/www/app/feature/ping.js                 | 10 ++++++++--
 proscend/prosrc/www/app/feature/traceroute.js           | 10 ++++++++--
 proscend/prosrc/www/app/services/icos.service.js        |  5 +++++
 proscend/prosrc/www/src/app/feature/ping.html.src       |  6 ++----
 proscend/prosrc/www/src/app/feature/traceroute.html.src |  6 ++----
 8 files changed, 46 insertions(+), 13 deletions(-)

commit 4420945297d12671b6dc755faa06747606770849
Refs: [release/v0.04], {origin/release/v0.04}
Author: jeffrey <[email protected]>
Date:   Wed Jun 3 17:56:33 2020 +0800

    no more hardcoded interface options at 'Interface' field at 'IP Routing > RIP'

 proscend/prosrc/icos/icoslib/utility/icos_utility.c | 10 ++++++++++
 proscend/prosrc/icos/include/icos_utility.h         |  1 +
 proscend/prosrc/webcgi/icos_iface.c                 |  9 +++++++++
 proscend/prosrc/www/app/feature/rip_2g.html         |  2 +-
 proscend/prosrc/www/app/feature/rip_2g.js           | 12 +++++++++---
 proscend/prosrc/www/app/services/icos.service.js    |  5 +++++
 6 files changed, 35 insertions(+), 4 deletions(-)