20181101_jeffrey - silenceuncrio/diary GitHub Wiki
0910
review
0930
先整理一下 nhrp 可以參考的文件
- Introduction to Multipoint GRE and NHRP
- Dynamic Multipoint VPN (DMVPN) Phase 3 with Quagga NHRPd
- frr/nhrpd/README.nhrpd
- [opennhrp-devel] Quagga-NHRP
- nhrpd man page
1010
M300 V1.74 CTCU 又反應一些 UI 上的問題
雖然不是我負責的模組被發現問題
不過 Administration 的確有無法刪除 user 的問題
趕緊修一下
commit b7cae45f5f2734770ad25bd69f6eec6f6a0d7644
Refs: [hotfix/v1.74], {origin/hotfix/v1.74}
Author: jeffrey <[email protected]>
Date: Thu Nov 1 09:54:42 2018 +0800
fix the problem at 'Asministration' web page
proscend/prosrc/www/app/feature/administration.js | 5 +++++
1 file changed, 5 insertions(+)
1020
由 [Dynamic Multipoint VPN (DMVPN) Phase 3 with Quagga NHRPd] 這一篇可以知道
我可以在 M300 shell 直接使用 vtysh 來設定 quagga 相關的功能
我可以用這個方式來了解 nhrpd 有哪些設定項目
1135
剛剛急著改的東西竟然把 conflict 的東西直接 commit 而不自知
趕快修正
diff --git a/proscend/prosrc/www/app/feature/administration.js b/proscend/prosrc/www/app/feature/administration.js
index c1f8027..88a8dfd 100644
--- a/proscend/prosrc/www/app/feature/administration.js
+++ b/proscend/prosrc/www/app/feature/administration.js
@@ -91,12 +91,7 @@
for (var i = 1; i < 4; i ++) {
var name = vm.system.user[i].szUsername;
-<<<<<<< Updated upstream
- if (name != vm.user_previous[i].szUsername) {
-=======
if ( (name != vm.user_previous[i].szUsername) && (name != null)) {
-
->>>>>>> Stashed changes
if (vm.system.user[i].userLevel == 0) {
var info = 'Please assign user level to the user "' + name + '"!'
swal({title:"Error", text:info, type:"error", });
自己 local 先測一下
build image... ok
測一下... ok
1300
發現自己還是改錯了
應該是以下的修正才是
diff --git a/proscend/prosrc/www/app/feature/administration.js b/proscend/prosrc/www/app/feature/administration.js
index 88a8dfd..b5bdc7e 100644
--- a/proscend/prosrc/www/app/feature/administration.js
+++ b/proscend/prosrc/www/app/feature/administration.js
@@ -91,7 +91,7 @@
for (var i = 1; i < 4; i ++) {
var name = vm.system.user[i].szUsername;
- if ( (name != vm.user_previous[i].szUsername) && (name != null)) {
+ if ( (name != vm.user_previous[i].szUsername) && (name != '')) {^M
if (vm.system.user[i].userLevel == 0) {
var info = 'Please assign user level to the user "' + name + '"!'
swal({title:"Error", text:info, type:"error", });
也罷
V1.74 就這樣吧
等 hotfix/v1.74 併回 develop 後再修正
反正是一個一直以來都有的問題
只是沒人反應而已