20181022_jeffrey - silenceuncrio/diary GitHub Wiki
0830
review
待作事項
- M300 - LTE Config -
Lock LTE Band與Lock GSM/WCDMA Band是否隱藏 - M300 - check https mantis issue
- M300 - check ariel 新的 proposal - sms control do
- M360 -
Hardware version的顯示由 uboot envHW_VER來決定 目前版本為A0
先 pull 最新的 M300 source code
這禮拜預計要 release 的 branch 為 release/v1.74
0940
build 好了
mfgtool 燒錄 code... ok
1000
LTE Config 修改的 source code 應該是 proscend/prosrc/www/src/app/feature/lteConfig.html.src
而不是 make 後產生的 proscend/prosrc/www/app/feature/lteConfig.html
commit 75136ae2798118c1aa2bd62ba6a53da1f86a8878
Refs: [release/v1.74], {origin/release/v1.74}
Author: jeffrey <[email protected]>
Date: Mon Oct 22 10:06:30 2018 +0800
remove 'Lock LTE Band' and 'Lock GSM/WCDMA Band' fields from the 'LTE Config' web page
proscend/prosrc/www/src/app/feature/lteConfig.html.src | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
1010
看一下 ariel 的 proposal
1100
commit 2f788be890cc4d3e8dead29cb820fe61f9b7898d
Refs: [release/v1.74], {origin/release/v1.74}
Author: jeffrey <[email protected]>
Date: Mon Oct 22 10:58:47 2018 +0800
about 'LTE / SMS' web page:
- at 'SMS Action' tab:
- add the following fields:
- DO On
- DO Off
- DO Pulse
- Restore DO Alarm
- Hint
- at 'View SMS' tab:
- add 'Clear' button
proscend/prosrc/webcgi/lte.c | 20 ++++++++++++
proscend/prosrc/www/app/feature/sms.html | 22 +++++++++++--
proscend/prosrc/www/app/feature/sms.js | 39 ++++++++++++++++++++----
proscend/prosrc/www/app/locale-en.json | 4 +++
proscend/prosrc/www/app/locale-fr.json | 4 +++
proscend/prosrc/www/app/locale-zh-tw.json | 4 +++
proscend/prosrc/www/app/services/icos.service.js | 3 ++
7 files changed, 88 insertions(+), 8 deletions(-)
不過 hint 上的超連結要等一下 aaron 的修改後才能確定
1105
ariel 的 proposal 還有提到 GPS 相關的修改
先 build 一版有 GPS 的版本... ok
mfgtool 燒錄... ok
1415
commit 72da38616f21cc9e527be93ad6d8fa78316a98de
Refs: [release/v1.74], {origin/release/v1.74}
Author: jeffrey <[email protected]>
Date: Mon Oct 22 14:13:57 2018 +0800
re-design the 'LTE / GPS' web page according the proposal
proscend/prosrc/webcgi/lte.c | 36 +++++
proscend/prosrc/www/app/feature/lteGps.js | 32 +++++
proscend/prosrc/www/app/locale-en.json | 4 +-
proscend/prosrc/www/app/locale-fr.json | 4 +-
proscend/prosrc/www/app/locale-zh-tw.json | 4 +-
proscend/prosrc/www/app/services/icos.service.js | 3 +
.../prosrc/www/src/app/feature/lteGps.html.src | 150 ++++++++++++++-------
7 files changed, 181 insertions(+), 52 deletions(-)
再盤一下待作事項
- M300 - check https mantis issue
- M360 -
Hardware version的顯示由 uboot envHW_VER來決定 目前版本為A0
關於 https mantis issue 我先實際測一下
1505
作了以下修改之後就解掉了
diff --git a/proscend/prosrc/icos/icoslib/web/webcfg.c b/proscend/prosrc/icos/icoslib/web/webcfg.c
index 3d57f60..80701da 100644
--- a/proscend/prosrc/icos/icoslib/web/webcfg.c
+++ b/proscend/prosrc/icos/icoslib/web/webcfg.c
@@ -80,6 +80,7 @@ typedef struct daemon_ctrl_s
int retry_cnt; //Stop when count down to zero or negative.
//int ip_ver; //Specific the ip version for this daemon, 4 for ipv4,6 for ipv6,and 0 for dual.
int did; //Daemon ID,DID_HTTPD/DID_HTTPS
+ int starting_once; // successful starting once or not
} DAEMON_CTRL_T;
typedef struct runtime_info_s
@@ -712,6 +713,7 @@ static int controller_init(sWebConfig *cfgp)
gWebCtrl.dmn_ctrl[i].flag=0;
gWebCtrl.dmn_ctrl[i].pid=BAD_PID;
gWebCtrl.dmn_ctrl[i].retry_cnt=MAX_DAEMON_RETRY_NUM; //-1 for forever
+ gWebCtrl.dmn_ctrl[i].starting_once = 0;
gWebCtrl.dmn_ctrl[i].is_keyfile_ready=0;
if (keyfile && certfile)
@@ -1083,10 +1085,13 @@ static int _termcb(char *msg, pid_t pid)
if (gWebCtrl.dmn_ctrl[i].did == DID_HTTPS)
{
- remove(WEB_DAEMON_KEY_FILE);
- remove(WEB_DAEMON_CERT_FILE);
- gWebCtrl.dmn_ctrl[i].is_keyfile_ready = 0;
- WEB_INFO("HTTPS terminate, remove key and cert and restart the daemon\n");
+ if (gWebCtrl.dmn_ctrl[i].starting_once == 0)
+ {
+ remove(WEB_DAEMON_KEY_FILE);
+ remove(WEB_DAEMON_CERT_FILE);
+ gWebCtrl.dmn_ctrl[i].is_keyfile_ready = 0;
+ WEB_INFO("HTTPS terminate and never starting successful yet, remove key and cert and restart the daemon\n");
+ }
}
daemon_restart(&gWebCtrl.dmn_ctrl[i]);
@@ -1130,63 +1135,35 @@ static int _termcb(char *msg, pid_t pid)
return ICOS_SUCCESS;
}
-/*
+
+
static void daemon_event(DAEMON_CTRL_T *dmn_ctrl,char *msg)
{
- ...
+
+#define WEB_DAEMON_STARTING_HTTP_ON_PORT_XXX "Starting HTTP on port"
+#define WEB_DAEMON_STARTING_HTTPS_ON_PORT_XXX "Starting HTTPS on port"
+
+ char *line;
+ char *saveptr;
+ char *ptr;
+
+ if(strstr(msg, WEB_DAEMON_STARTING_HTTP_ON_PORT_XXX))
+ {
+ WEB_INFO("Starting HTTP success\n");
+ dmn_ctrl->starting_once = 1;
+ return;
+ }
+
+ if(strstr(msg, WEB_DAEMON_STARTING_HTTPS_ON_PORT_XXX))
+ {
+ WEB_INFO("Starting HTTPS success\n");
+ dmn_ctrl->starting_once = 1;
+ return;
+ }
+
}
-*/
+
+
static int _msgcb(char *msg, pid_t pid, int rc)
{
@@ -1214,7 +1191,7 @@ static int _msgcb(char *msg, pid_t pid, int rc)
WEB_DAEMON("%s",msg);
WEB_DAEMON("-->\n");
#endif
- //daemon_event(dmn_ctrl,msg);
+ daemon_event(dmn_ctrl,msg);
}
return ICOS_SUCCESS;
}
上 code
commit ee5fc0901ebde21695537b0eaedc07833bbbcc6d
Refs: [release/v1.74], {origin/release/v1.74}
Author: jeffrey <[email protected]>
Date: Mon Oct 22 15:06:38 2018 +0800
solve mantis issue 287: https regenerate hey issue
proscend/prosrc/icos/icoslib/web/webcfg.c | 95 ++++++++++++-------------------
1 file changed, 36 insertions(+), 59 deletions(-)
再盤一下待作事項
- M360 -
Hardware version的顯示由 uboot envHW_VER來決定 目前版本為A0
M360 的部分先暫緩
這禮拜以 M300 V1.74 release 為優先
1520
盤一下未來幾周的待作事項
- M300
- GRE tunnel with NHRP - 11-01 ~ 11-15
- M360 - end: 11-09
- Ethernet Status
- Schedule Reboot
- PLMN display