eeeck/zyxel-vmg8825_b50b-cfw
1
1
Fork 0
Code Activity

Initial dump from Zyxel

Browse Source
This commit is contained in:
Erick
2026-04-17 17:00:52 +02:00
commit 81fec250f4
23116 changed files with 5231237 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package/public-zyxel/libzcfg_msg/patches/000-fix_memory_leakage.patch
+18
View File
@@ -0,0 +1,18 @@
--- a/zcfg_msg.c
+++ b/zcfg_msg.c
@@ -246,6 +246,7 @@ zcfgRet_t zcfgMsgSendAndGetReply(zcfgMsg
int flags;
if( myEid == -1 ){
+ free(sendMsg);
zcfgLog(ZCFG_LOG_ERR, "Invalid eid\n");
return ZCFG_INVALID_EID;
}
@@ -272,6 +273,7 @@ zcfgRet_t zcfgMsgSendAndGetReply(zcfgMsg
perror("client: bind");
close(fd);
unlink(clientaddr.sun_path);
+ free(sendMsg);
return -1;
}
package/public-zyxel/libzcfg_msg/patches/001-BUGFIX_COMMON_tr64_update_device.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-02-12 19:24:24.000000000 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-03-07 18:49:53.783131521 +0800
@@ -101,6 +101,7 @@
#define ZCFG_MSG_VLAN_HUNT_SET_TIMEOUT (44 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_MGMT_CONNECT_UPDATE (45 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_DOWNLOAD_DIAG_COMPLETE_EVENT (46 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_TR64_LAN_DEVICE_UPDATE (47 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/002-FEATURE_COMMON_add_event_for_voice_related_function.patch
+227
View File
@@ -0,0 +1,227 @@
Index: libzcfg_msg-1.0/Makefile
===================================================================
--- libzcfg_msg-1.0.orig/Makefile 2013-12-13 00:58:47.000000000 -0800
+++ libzcfg_msg-1.0/Makefile 2014-03-10 02:20:37.388342000 -0700
@@ -16,9 +16,11 @@
install -m 755 libzcfg_msg.so $(INSTALL_DIR)/lib/public
install -m 666 zcfg_msg.h $(COMMON_ZCFG_INCLUDE_DIR)
install -m 666 zcfg_msg_voice.h $(COMMON_ZCFG_INCLUDE_DIR)
+ install -m 666 zcfg_msg_dect.h $(COMMON_ZCFG_INCLUDE_DIR)
clean:
rm -rf *.o
rm -rf *.so
rm -rf $(COMMON_ZCFG_INCLUDE_DIR)/zcfg_msg.h
rm -rf $(COMMON_ZCFG_INCLUDE_DIR)/zcfg_msg_voice.h
+ rm -rf $(COMMON_ZCFG_INCLUDE_DIR)/zcfg_msg_dect.h
\ No newline at end of file
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-03-10 03:17:50.800330575 -0700
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-03-10 03:27:34.266402700 -0700
@@ -45,6 +45,8 @@
#define ZCFG_MSG_VOICE_CONTROL 30
#define ZCFG_MSG_VOICE_DEBUG_AND_TEST 31
#define REQUEST_REINIT_MACLESS_PROVISIONING 32
+#define ZCFG_MSG_DECT_CONTROL 33
+#define ZCFG_MSG_DECT_STATS_GET 34
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
@@ -102,7 +104,7 @@
#define ZCFG_MSG_MGMT_CONNECT_UPDATE (45 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_DOWNLOAD_DIAG_COMPLETE_EVENT (46 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_TR64_LAN_DEVICE_UPDATE (47 | ZCFG_NO_WAIT_REPLY)
-
+#define ZCFG_MSG_VOICE_CONFIG_CHANGED_PARTIAL_RELOAD (48 | ZCFG_NO_WAIT_REPLY)
Index: libzcfg_msg-1.0/zcfg_msg_dect.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ libzcfg_msg-1.0/zcfg_msg_dect.h 2014-03-10 02:20:37.288342000 -0700
@@ -0,0 +1,86 @@
+#ifndef _ZCFG_MSG_DECT_H
+#define _ZCFG_MSG_DECT_H
+#include "zcfg_common.h"
+
+#define ZCFG_MSG_DECT_REPLY_WAIT_TIMEOUT 2000 //ms
+
+
+/*************************/
+/*** DECT Stats Update ***/
+/*************************/
+
+//*** DECT Stats Update REQuest ***
+#define DECT_STATS_REQ_HANDSET_REGISTRATION_STATUS (1 << 0)
+#define DECT_STATS_REQ_BASESTATION_BASESTATUS (1 << 0)
+
+typedef struct dectStatsReq_s{
+ uint16_t bitFlag;
+
+ uint16_t registerStatus; //bitmap: each bit (from the LSB) is corresponding to one DECT handset. Markup dedicated bit to indicate requesting its corresponding DECT handset's Registration Status. This is designed to support 16 DECT handsets.
+
+
+} dectStatsReq_t;
+
+//*** DECT Stats Update ReSPonse ***
+#define DECT_STATS_RSP_HANDSET_REGISTRATION_STATUS (1 << 0)
+#define DECT_STATS_RSP_BASESTATION_BASESTATUS (1 << 0)
+
+typedef struct dectStatsRsp_s{
+ uint16_t bitFlag;
+
+ uint16_t registerStatus; //bitmap: each bit (from the LSB) is corresponding to one DECT handset. A bit=1 means the corresponding DECT handset is registered. A bit=0 means otherwise.
+ uint32_t baseStatus;
+
+
+} dectStatsRsp_t;
+
+
+/******************/
+/*** DECT Control ***/
+/******************/
+typedef enum dectCtrlCmdType_es
+{
+ DECT_CTRL_CMD_NONE=0,
+ DECT_CTRL_CMD_BS, //Base Station.
+ DECT_CTRL_CMD_HS, //Handset.
+ DECT_CTRL_CMD_UNDEFINED
+} dectCtrlCmdType_et;
+//------
+typedef enum dectBSCtrlCmdId_es
+{
+ DECT_BS_CTRL_NONE=0,
+ DECT_BS_CTRL_RESET, //Parameter: (none).
+ DECT_BS_CTRL_REGISTER_MODE_ENABLE, //Parameter: CmdPara[0]=ON(1)/OFF(0). CmdPara[1]=(none).
+ DECT_BS_CTRL_DEREGISTER_HS, //Parameter: CmdPara[0]=(none), CmdPara[1]=HS selection bitmap(uint16_t).
+ DECT_BS_CTRL_PAGING_HS_ENABLE, //Parameter: CmdPara[0]=ON(1)/OFF(0), CmdPara[1]=HS selection bitmap(uint16_t).
+ DECT_BS_CTRL_UNDEFINED
+} dectBSCtrlCmdId_et;
+//------
+typedef enum dectHSCtrlCmdId_es
+{
+ DECT_HS_CTRL_NONE=0,
+ DECT_HS_CTRL_UNDEFINED
+} dectHSCtrlCmdId_et;
+//------
+
+//*** DECT Control REQuest ***
+#define DECT_CTRL_CMD_PARA_MAX 2 //NOTE: This value MUST be >= 2 because there has been many quick access for CmdPara[] by CmdPara[0] & CmdPara[1]!!
+#define DECT_CTRL_CMD_DO_ACTION_OFF 0
+#define DECT_CTRL_CMD_DO_ACTION_ON 1
+typedef struct dectCtrlReq_s {
+ uint8_t CmdType; //dectCtrlCmdType_et.
+ uint8_t CmdId; //dectBSCtrlCmdId_et or dectHSCtrlCmdId_et.
+ uint32_t CmdPara[DECT_CTRL_CMD_PARA_MAX];
+} dectCtrlReq_t;
+
+
+//*** DECT Control ReSPonse ***
+#define DECT_CTRL_CMD_SUCCESS 0
+#define DECT_CTRL_CMD_FAIL 1
+typedef struct dectCtrlRsp_s {
+ uint8_t CmdType; //dectCtrlCmdType_et.
+ uint8_t CmdId; //dectBSCtrlCmdId_et or dectHSCtrlCmdId_et.
+ uint8_t CmdResult; //Success(0), Fail(1).
+} dectCtrlRsp_t;
+
+#endif //_ZCFG_MSG_DECT_H
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2013-11-27 19:53:51.000000000 -0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2014-03-10 02:20:37.388342000 -0700
@@ -4,6 +4,41 @@
#define ZCFG_MSG_VOICE_REPLY_WAIT_TIMEOUT 2000 //ms
+/*************************************/
+/*** Voice Config Change Partial Reload ***/
+/*************************************/
+#define VOICE_CONFIG_CHANGED_PARTIAL_RELOAD_PARA_MAX 3
+
+//*** Voice config change partial load types ***
+#define VOICE_CONFIG_CHANGED_PARTIAL_RELOAD_TYPE_DECT (1 << 0)
+
+//*** Voice config change partial load flag for DECT ***
+#define DECT_PARTIAL_RELOAD_FLAG_BS_FUNCTION_ENABLE (1 << 0)
+#define DECT_PARTIAL_RELOAD_FLAG_BS_NAME (1 << 1)
+#define DECT_PARTIAL_RELOAD_FLAG_BS_PIN_CODE (1 << 2)
+#define DECT_PARTIAL_RELOAD_FLAG_BS_ENCRYPTION_ENABLE (1 << 3)
+#define DECT_PARTIAL_RELOAD_FLAG_BS_NEMO_ENABLE (1 << 4)
+#define DECT_PARTIAL_RELOAD_FLAG_BS_ECO_MODE_ENABLE (1 << 5)
+#define DECT_PARTIAL_RELOAD_FLAG_BS_RF_STRENGTH (1 << 6)
+#define DECT_PARTIAL_RELOAD_FLAG_BS_REGISTRATION_DURATION (1 << 7)
+#define DECT_PARTIAL_RELOAD_FLAG_BS_PAGING_DURATION (1 << 8)
+
+#define DECT_PARTIAL_RELOAD_FLAG_HS_NAME (1 << 9)
+#define DECT_PARTIAL_RELOAD_FLAG_HS_INTERNAL_PHONE_NUM (1 << 10)
+#define DECT_PARTIAL_RELOAD_FLAG_HS_LINE_SELECT (1 << 11)
+
+
+
+
+
+
+
+
+/***********************/
+/*** Voice Stats Update ***/
+/***********************/
+
+//*** Voice Stats Update REQuest ***
#define VOICE_STATS_REQ_REGISTRATION_STATUS (1 << 0)
#define VOICE_STATS_REQ_MWI_STATUS (1 << 1)
#define VOICE_STATS_REQ_CALL_STATE (1 << 2)
@@ -17,6 +52,8 @@
uint8_t fxsHookState; //bitmap: each bit (from the LSB) is corresponding to one FXS phone port. Markup dedicated bit to indicate requesting its corresponding FXS phone port's Hood State. This is designed to support 8 FXS phone ports - FXS-00 ~ FXS-07.
} voiceStatsReq_t;
+
+//*** Voice Stats Update ReSPonse ***
#define VOICE_STATS_RSP_REGISTRATION_STATUS_SET1 (1 << 0)
#define VOICE_STATS_RSP_REGISTRATION_STATUS_SET2 (1 << 1)
#define VOICE_STATS_RSP_MWI_STATUS (1 << 2)
@@ -40,7 +77,14 @@
uint8_t fxsHookState; //bitmap: each bit (from the LSB), which represents OnHooked=0 & OffHooked=1, is corresponding to one FXS phone port. This can handle 8 FXS phone ports - FXS-00 ~ FXS-07.
} voiceStatsRsp_t;
+
+
+/******************/
+/*** Voice Control ***/
+/******************/
+
//Michael.20131125.001.B: Add.
+//*** Voice Control REQuest ***
#define VOICE_CONTROL_REQ_CONVENTIONAL_VOIP_CLI (1 << 0)
#define VOICE_CONTROL_REQ_SIP_REGISTER (1 << 1)
//------
@@ -50,14 +94,26 @@
#define VOICE_CONTROL_REQ_SIP_REGISTER_DO_DEREGISTER 2
#define VOICE_CONTROL_REQ_SIP_REGISTER_ACTION_MASK 0x03
#define VOICE_CONTROL_REQ_SIP_REGISTER_ACTION_SHIFT_UNIT 2
+
+#ifdef ZYXEL_ZYIMS_CMD_TEST //__ZYXEL__, Mark
+typedef enum{
+ VOICE_CLI_ZYIMSCMD
+}voiceCliType;
+#endif
+
typedef struct voiceCtrlReq_s {
uint32_t bitFlag;
//NOTE: No fixed (string-type) parameter for the conventional VoIP CLI command string is defined here, because it will be appended at the end of the structure as a payload.
uint32_t sipRegisterAct; //bitmap: every successive 2bit (from the LSB) as a set, which can represent 4 statuses, is corresponding to one SIP account/line's register action. Markup dedicated set to indicate requesting its corresponding SIP account/line's SIP regiter action. This is designed to support 16 SIP accounts/lines - SIP-00 ~ SIP-15.
+#ifdef ZYXEL_ZYIMS_CMD_TEST //__ZYXEL__, Mark
+ voiceCliType cliType;
+ char cmdLine[200];
+#endif
} voiceCtrlReq_t;
+//*** Voice Control ReSPonse ***
#define VOICE_CONTROL_RSP_CONVENTIONAL_VOIP_CLI (1 << 0)
#define VOICE_CONTROL_RSP_SIP_REGISTER (1 << 1)
//------
package/public-zyxel/libzcfg_msg/patches/010-ENHANCE_COMMON_new_msg_for_wifi_daemon.patch
+23
View File
@@ -0,0 +1,23 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-04-24 15:23:30.319105117 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-04-24 15:24:54.072314244 +0800
@@ -47,6 +47,7 @@
#define REQUEST_REINIT_MACLESS_PROVISIONING 32
#define ZCFG_MSG_DECT_CONTROL 33
#define ZCFG_MSG_DECT_STATS_GET 34
+#define ZCFG_MSG_WIFI_RELOAD_CHECK 35
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
@@ -105,8 +106,8 @@
#define ZCFG_MSG_DOWNLOAD_DIAG_COMPLETE_EVENT (46 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_TR64_LAN_DEVICE_UPDATE (47 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_VOICE_CONFIG_CHANGED_PARTIAL_RELOAD (48 | ZCFG_NO_WAIT_REPLY)
-
-
+#define ZCFG_MSG_WIFI_RELOAD (49 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WPS_RELOAD (50 | ZCFG_NO_WAIT_REPLY)
/* end ZCFG message type */
package/public-zyxel/libzcfg_msg/patches/012-ENHANCE_Let_esmd_to_enable_wifi_led.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-05-13 16:05:12.692436124 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-05-13 16:06:22.430626205 +0800
@@ -111,6 +111,7 @@
#define ZCFG_MSG_VOICE_CONFIG_CHANGED_PARTIAL_RELOAD (48 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_WIFI_RELOAD (49 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_WPS_RELOAD (50 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WIFI_LED_ENABLE (51 | ZCFG_NO_WAIT_REPLY)
/* end ZCFG message type */
package/public-zyxel/libzcfg_msg/patches/013-ENHANCE_DHCPC_add_renew_msg_type.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-05-14 12:07:18.075904014 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-05-14 12:08:45.492039739 +0800
@@ -109,7 +109,7 @@
#define ZCFG_MSG_WIFI_RELOAD (49 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_WPS_RELOAD (50 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_WIFI_LED_ENABLE (51 | ZCFG_NO_WAIT_REPLY)
-
+#define ZCFG_MSG_DHCPC_RENEW (52 | ZCFG_NO_WAIT_REPLY)
/* end ZCFG message type */
#define ZCFG_ADDRESS_PREFIX "/tmp/zcfg_sockaddr"
package/public-zyxel/libzcfg_msg/patches/020-ENHANCE_COMMON_zcmd_multi_thread_arch.patch
+14
View File
@@ -0,0 +1,14 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-05-13 17:22:29.771747533 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-05-13 17:24:11.423970874 +0800
@@ -10,6 +10,9 @@
#define ERROR_APPLY_MSG -1
#define ZCFG_NO_WAIT_REPLY (1 << 31)
+#if 1 /* non-blocking config apply, ZyXEL, John */
+#define ZCFG_BLOCK_MODE_CONFIG_APPLY (1 << 30)
+#endif
/* ZCFG message type with waiting reply*/
#define REQUEST_GET_NEXT_OBJ 0
package/public-zyxel/libzcfg_msg/patches/021-BUGFIX_COMMON_enable_vc_vlan_re_hunting.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-05-29 11:04:13.053140484 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-05-29 11:06:18.913943909 +0800
@@ -113,6 +113,8 @@
#define ZCFG_MSG_WPS_RELOAD (50 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_WIFI_LED_ENABLE (51 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_DHCPC_RENEW (52 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_AUTOHUNT_FINISH (53 | ZCFG_NO_WAIT_REPLY)
+
/* end ZCFG message type */
#define ZCFG_ADDRESS_PREFIX "/tmp/zcfg_sockaddr"
package/public-zyxel/libzcfg_msg/patches/022-ENHANCE_COMMON_libzcfg_msg_support_ZyIMS_CLI.patch
+54
View File
@@ -0,0 +1,54 @@
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2014-06-12 11:57:14.117423243 +0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2014-06-11 21:16:44.884024200 +0800
@@ -2,6 +2,7 @@
#define _ZCFG_MSG_VOICE_H
#include "zcfg_common.h"
+
#define ZCFG_MSG_VOICE_REPLY_WAIT_TIMEOUT 2000 //ms
/*************************************/
@@ -87,6 +88,9 @@
//*** Voice Control REQuest ***
#define VOICE_CONTROL_REQ_CONVENTIONAL_VOIP_CLI (1 << 0)
#define VOICE_CONTROL_REQ_SIP_REGISTER (1 << 1)
+//Steve.2014-06-11 ADD
+#define VOICE_CONTROL_REQ_GET_DEBUG_FLAG (1 << 2)
+#define VOICE_CONTROL_REQ_SET_DEBUG_FLAG (1 << 3)
//------
#define VOICE_CONTROL_REQ_SIP_REGISTER_SIP_ACCT_MAX 16
#define VOICE_CONTROL_REQ_SIP_REGISTER_NO_ACTION 0
@@ -94,6 +98,14 @@
#define VOICE_CONTROL_REQ_SIP_REGISTER_DO_DEREGISTER 2
#define VOICE_CONTROL_REQ_SIP_REGISTER_ACTION_MASK 0x03
#define VOICE_CONTROL_REQ_SIP_REGISTER_ACTION_SHIFT_UNIT 2
+//Steve.2014-06-11 ADD to define Debug Flag
+#define VOICE_CONTROL_REQ_DEBUG_FLAG_MASK 0x3
+#define VOICE_CONTROL_REQ_DEBUG_FLAG_VOICEAPP 0
+#define VOICE_CONTROL_REQ_DEBUG_FLAG_CCM 2
+#define VOICE_CONTROL_REQ_DEBUG_FLAG_PHONE 4
+#define VOICE_CONTROL_REQ_DEBUG_FLAG_SIP 6
+#define VOICE_CONTROL_REQ_DEBUG_FLAG_TR104 8
+
#ifdef ZYXEL_ZYIMS_CMD_TEST //__ZYXEL__, Mark
typedef enum{
@@ -106,6 +118,8 @@
//NOTE: No fixed (string-type) parameter for the conventional VoIP CLI command string is defined here, because it will be appended at the end of the structure as a payload.
uint32_t sipRegisterAct; //bitmap: every successive 2bit (from the LSB) as a set, which can represent 4 statuses, is corresponding to one SIP account/line's register action. Markup dedicated set to indicate requesting its corresponding SIP account/line's SIP regiter action. This is designed to support 16 SIP accounts/lines - SIP-00 ~ SIP-15.
+ uint32_t DebugFlag; //Steve.2014-06-11-1013
+ uint32_t DataValue; //Pass the data value to CLI "get" command 2014-06-11 Steve.
#ifdef ZYXEL_ZYIMS_CMD_TEST //__ZYXEL__, Mark
voiceCliType cliType;
char cmdLine[200];
@@ -124,6 +138,7 @@
//NOTE: No fixed (string-type) parameter for the conventional VoIP CLI result string is defined here, because it will be appended at the end of the structure as a payload.
uint16_t sipRegisterActResult; //bitmap: each bit (from the LSB), which represents ActionSuccess=0 & ActionFail=1, is corresponding to one SIP account/line's register action result.
+ uint32_t DataValue; //Pass the data value to CLI "get" command 2014-06-11 Steve.
} voiceCtrlRsp_t;
//Michael.20131125.001.B: Add.
package/public-zyxel/libzcfg_msg/patches/025-ENHANCE_COMMON_get_all_IGD_obj_names.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-06-12 15:17:06.500087674 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-06-12 15:19:26.558842387 +0800
@@ -51,6 +51,7 @@
#define ZCFG_MSG_DECT_CONTROL 33
#define ZCFG_MSG_DECT_STATS_GET 34
#define ZCFG_MSG_WIFI_RELOAD_CHECK 35
+#define ZCFG_MSG_GET_TR98_ALL_IGD_NAMES 36
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
package/public-zyxel/libzcfg_msg/patches/026-ENHANCE_Voice_EnableDisable_SIPAcct_WithOut_Reloading_AllVoipConfigData_and_DeregThenReregister_AllSIPAccts.patch
+57
View File
@@ -0,0 +1,57 @@
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2014-07-07 10:31:30.445525650 +0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2014-06-26 16:31:08.388009200 +0800
@@ -4,6 +4,31 @@
#define ZCFG_MSG_VOICE_REPLY_WAIT_TIMEOUT 2000 //ms
+#define VOICE_SIP_ACCT_MAX 16 //Michael.20140625.001: Add.
+
+
+//Michael.20140625.001.B: Add.
+/************************/
+/*** Voice Config Change ***/
+/************************/
+
+//*** Voice Config Change REQuest ***
+#define VOICE_CONFIG_REQ_SIP_LINE_ACTIVATE (1 << 0)
+//------
+#define VOICE_CONFIG_REQ_SIP_ACCT_MAX VOICE_SIP_ACCT_MAX
+#define VOICE_CONFIG_REQ_SIP_LINE_ACTIVATE_NO_ACTION 0
+#define VOICE_CONFIG_REQ_SIP_LINE_ACTIVATE_ENABLE 1
+#define VOICE_CONFIG_REQ_SIP_LINE_ACTIVATE_DISABLE 2
+#define VOICE_CONFIG_REQ_SIP_LINE_ACTIVATE_MASK 0x03
+#define VOICE_CONFIG_REQ_SIP_LINE_ACTIVATE_SHIFT_UNIT 2
+typedef struct voiceConfigReq_s {
+ uint16_t bitFlag;
+
+ uint32_t sipLineActivation; //bitmap: every successive 2bit (from the LSB) as a set, which can represent 3 action states (Reset/Idle/NoAction, Enable, Disable), is corresponding to one SIP account/line. This can handle 16 SIP accounts/lines - SIP-00 ~ SIP-15.
+} voiceConfigReq_t;
+//Michael.20140625.001.E: Add.
+
+
/*************************************/
/*** Voice Config Change Partial Reload ***/
@@ -30,11 +55,6 @@
-
-
-
-
-
/***********************/
/*** Voice Stats Update ***/
/***********************/
@@ -92,7 +112,7 @@
#define VOICE_CONTROL_REQ_GET_DEBUG_FLAG (1 << 2)
#define VOICE_CONTROL_REQ_SET_DEBUG_FLAG (1 << 3)
//------
-#define VOICE_CONTROL_REQ_SIP_REGISTER_SIP_ACCT_MAX 16
+#define VOICE_CONTROL_REQ_SIP_REGISTER_SIP_ACCT_MAX VOICE_SIP_ACCT_MAX //Michael.20140625.001: Modify from '16' to 'VOICE_SIP_ACCT_MAX'.
#define VOICE_CONTROL_REQ_SIP_REGISTER_NO_ACTION 0
#define VOICE_CONTROL_REQ_SIP_REGISTER_DO_REGISTER 1
#define VOICE_CONTROL_REQ_SIP_REGISTER_DO_DEREGISTER 2
package/public-zyxel/libzcfg_msg/patches/027-ENHANCE_CUSTOMIZE_dect_module_FW_upgrade_add_DECT_BS_CTRL_FIRMWARE_UPGRADE.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg_dect.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_dect.h 2014-07-21 10:51:36.020895488 -0700
+++ libzcfg_msg-1.0/zcfg_msg_dect.h 2014-07-21 10:53:43.980921568 -0700
@@ -53,6 +53,7 @@
DECT_BS_CTRL_REGISTER_MODE_ENABLE, //Parameter: CmdPara[0]=ON(1)/OFF(0). CmdPara[1]=(none).
DECT_BS_CTRL_DEREGISTER_HS, //Parameter: CmdPara[0]=(none), CmdPara[1]=HS selection bitmap(uint16_t).
DECT_BS_CTRL_PAGING_HS_ENABLE, //Parameter: CmdPara[0]=ON(1)/OFF(0), CmdPara[1]=HS selection bitmap(uint16_t).
+ DECT_BS_CTRL_FIRMWARE_UPGRADE,
DECT_BS_CTRL_UNDEFINED
} dectBSCtrlCmdId_et;
//------
package/public-zyxel/libzcfg_msg/patches/028-EHANCE_Support_mcpctl.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-07-31 15:01:39.795274477 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-07-31 15:02:12.305042354 +0800
@@ -52,6 +52,7 @@
#define ZCFG_MSG_DECT_STATS_GET 34
#define ZCFG_MSG_WIFI_RELOAD_CHECK 35
#define ZCFG_MSG_GET_TR98_ALL_IGD_NAMES 36
+#define ZCFG_MSG_MCPCTL 37
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
package/public-zyxel/libzcfg_msg/patches/029-EHANCE_Support_save_clean_ROMD.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-07-31 15:02:12.305042354 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-07-31 15:07:45.836413456 +0800
@@ -53,6 +53,8 @@
#define ZCFG_MSG_WIFI_RELOAD_CHECK 35
#define ZCFG_MSG_GET_TR98_ALL_IGD_NAMES 36
#define ZCFG_MSG_MCPCTL 37
+#define ZCFG_MSG_CLEAN_ROMD 38
+#define ZCFG_MSG_SAVE_ROMD 39
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
package/public-zyxel/libzcfg_msg/patches/030-ENHANCE_CUSTOMIZE_add_FirmwareVersion_component_and_split_dect_stuct_to_dectBS_and_dectHS.patch
+69
View File
@@ -0,0 +1,69 @@
Index: libzcfg_msg-1.0/zcfg_msg_dect.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_dect.h 2014-08-20 23:07:43.462143873 -0700
+++ libzcfg_msg-1.0/zcfg_msg_dect.h 2014-08-20 20:45:38.666172200 -0700
@@ -13,26 +13,60 @@
#define DECT_STATS_REQ_HANDSET_REGISTRATION_STATUS (1 << 0)
#define DECT_STATS_REQ_BASESTATION_BASESTATUS (1 << 0)
-typedef struct dectStatsReq_s{
+/*typedef struct dectStatsReq_s{
uint16_t bitFlag;
uint16_t registerStatus; //bitmap: each bit (from the LSB) is corresponding to one DECT handset. Markup dedicated bit to indicate requesting its corresponding DECT handset's Registration Status. This is designed to support 16 DECT handsets.
-} dectStatsReq_t;
+} dectStatsReq_t;*/
+
+//Split dectStatsReq_s to dectBS_StatsReq_s and dectHS_StatsReq_s , yushiuan modify ,2014/08/21
+
+typedef struct dectBS_StatsReq_s{
+ uint16_t bitFlag;
+
+} dectBS_StatsReq_t;
+
+
+typedef struct dectHS_StatsReq_s{
+ uint16_t bitFlag;
+ uint16_t registerStatus; //bitmap: each bit (from the LSB) is corresponding to one DECT handset. Markup dedicated bit to indicate requesting its corresponding DECT handset's Registration Status. This is designed to support 16 DECT handsets.
+
+} dectHS_StatsReq_t;
+
+
+
//*** DECT Stats Update ReSPonse ***
#define DECT_STATS_RSP_HANDSET_REGISTRATION_STATUS (1 << 0)
#define DECT_STATS_RSP_BASESTATION_BASESTATUS (1 << 0)
-typedef struct dectStatsRsp_s{
+/*typedef struct dectStatsRsp_s{
uint16_t bitFlag;
uint16_t registerStatus; //bitmap: each bit (from the LSB) is corresponding to one DECT handset. A bit=1 means the corresponding DECT handset is registered. A bit=0 means otherwise.
uint32_t baseStatus;
+ char FirmwareVersion[33];
+
+} dectStatsRsp_t;*/
+
+//Split dectStatsRsp_s to dectBS_StatsRsp_s and dectHS_StatsRsp_s , yushiuan modify ,2014/08/21
+
+typedef struct dectBS_StatsRsp_s{
+ uint16_t bitFlag;
+ uint32_t baseStatus;
+ char FirmwareVersion[33];
+
+} dectBS_StatsRsp_t;
+
+typedef struct dectHS_StatsRsp_s{
+ uint16_t bitFlag;
+ uint16_t registerStatus; //bitmap: each bit (from the LSB) is corresponding to one DECT handset. A bit=1 means the corresponding DECT handset is registered. A bit=0 means otherwise.
+
+} dectHS_StatsRsp_t;
-} dectStatsRsp_t;
/******************/
package/public-zyxel/libzcfg_msg/patches/031_ENHANCE_Voice_MM_ICF_CLI_Define.patch
+29
View File
@@ -0,0 +1,29 @@
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2014-09-09 11:34:33.620702756 +0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2014-09-09 11:37:12.670692167 +0800
@@ -111,6 +111,8 @@
//Steve.2014-06-11 ADD
#define VOICE_CONTROL_REQ_GET_DEBUG_FLAG (1 << 2)
#define VOICE_CONTROL_REQ_SET_DEBUG_FLAG (1 << 3)
+#define VOICE_CONTROL_REQ_SET_ICF_DEBUG_FLAG (1 << 4)
+#define VOICE_CONTROL_REQ_SET_MM_DEBUG_FLAG (1 << 5)
//------
#define VOICE_CONTROL_REQ_SIP_REGISTER_SIP_ACCT_MAX VOICE_SIP_ACCT_MAX //Michael.20140625.001: Modify from '16' to 'VOICE_SIP_ACCT_MAX'.
#define VOICE_CONTROL_REQ_SIP_REGISTER_NO_ACTION 0
@@ -125,6 +127,15 @@
#define VOICE_CONTROL_REQ_DEBUG_FLAG_PHONE 4
#define VOICE_CONTROL_REQ_DEBUG_FLAG_SIP 6
#define VOICE_CONTROL_REQ_DEBUG_FLAG_TR104 8
+//Steve.2014-09-04 Define MM & ICF Debug Flag
+#define VOICE_CONTROL_REQ_MM_DEBUG_FLAG_RM 10
+#define VOICE_CONTROL_REQ_MM_DEBUG_FLAG_RTP 12
+#define VOICE_CONTROL_REQ_MM_DEBUG_FLAG_DSP 14
+#define VOICE_CONTROL_REQ_ICF_DEBUG_FLAG 16
+
+
+
+
#ifdef ZYXEL_ZYIMS_CMD_TEST //__ZYXEL__, Mark
package/public-zyxel/libzcfg_msg/patches/032-SUNRISE_VLANHUNT_CUSTOMIZATION.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-09-25 11:02:06.606518375 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-09-25 11:02:20.379798528 +0800
@@ -118,6 +118,8 @@
#define ZCFG_MSG_WIFI_LED_ENABLE (51 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_DHCPC_RENEW (52 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_AUTOHUNT_FINISH (53 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_ETHWAN_TR69_PROVISION_SUCCESS (54 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VLAN_HUNT_TERMINATE (55 | ZCFG_NO_WAIT_REPLY)
/* end ZCFG message type */
package/public-zyxel/libzcfg_msg/patches/033-ENHANCE_Voice_Database_Access.patch
+45
View File
@@ -0,0 +1,45 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-10-02 18:33:58.861856401 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-10-02 18:32:51.825428800 +0800
@@ -55,6 +55,7 @@
#define ZCFG_MSG_MCPCTL 37
#define ZCFG_MSG_CLEAN_ROMD 38
#define ZCFG_MSG_SAVE_ROMD 39
+#define ZCFG_MSG_VOICE_LIST_ACCESS 40
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2014-10-02 18:33:58.837856401 +0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2014-10-02 18:32:13.015479400 +0800
@@ -173,4 +173,28 @@
} voiceCtrlRsp_t;
//Michael.20131125.001.B: Add.
+
+/**************Voice List Access Msg*******************/
+//Types
+#define VOICE_LIST_ACCESS_REQ_CALLHISTORY_GET (1 << 0)
+#define VOICE_LIST_ACCESS_REQ_CALLHISTORY_PUT (1 << 1)
+#define VOICE_LIST_ACCESS_REQ_CALLHISTORY_CLEAR (1 << 2)
+#define VOICE_LIST_ACCESS_REQ_CALLHISTORY_BACKUP (1 << 3)
+#define VOICE_LIST_ACCESS_REQ_CALLHISTORY_RESTORE (1 << 4)
+#define VOICE_LIST_ACCESS_REQ_PHONEBOOK_GET (1 << 5)
+#define VOICE_LIST_ACCESS_REQ_PHONEBOOK_PUT (1 << 6)
+#define VOICE_LIST_ACCESS_REQ_PHONEBOOK_CLEAR (1 << 7)
+#define VOICE_LIST_ACCESS_REQ_PHONEBOOK_BACKUP (1 << 8)
+#define VOICE_LIST_ACCESS_REQ_PHONEBOOK_RESTORE (1 << 9)
+
+typedef struct voiceListAccessReq_s{
+ uint16_t Type;
+ char *Payload; //Request Data From GUI, Only PUT Method
+}voiceListAccessReq_t;
+typedef struct voiceListAccessRsp_s{
+ char *Payload;
+}voiceListAccessRsp_t;
+//Steve.2014-09-23
+
+
#endif //_ZCFG_MSG_VOICE_H
package/public-zyxel/libzcfg_msg/patches/034-ENHANCE_Voice_Debug_dest_Control_Req.patch
Executable
+22
View File
@@ -0,0 +1,22 @@
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2014-11-21 14:17:23.791129782 +0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2014-11-21 14:17:23.835129781 +0800
@@ -113,6 +113,8 @@
#define VOICE_CONTROL_REQ_SET_DEBUG_FLAG (1 << 3)
#define VOICE_CONTROL_REQ_SET_ICF_DEBUG_FLAG (1 << 4)
#define VOICE_CONTROL_REQ_SET_MM_DEBUG_FLAG (1 << 5)
+//Steve.2014-11-20 Support Log Dest
+#define VOICE_CONTROL_REQ_SET_DEBUG_DEST (1 << 6)
//------
#define VOICE_CONTROL_REQ_SIP_REGISTER_SIP_ACCT_MAX VOICE_SIP_ACCT_MAX //Michael.20140625.001: Modify from '16' to 'VOICE_SIP_ACCT_MAX'.
#define VOICE_CONTROL_REQ_SIP_REGISTER_NO_ACTION 0
@@ -132,6 +134,8 @@
#define VOICE_CONTROL_REQ_MM_DEBUG_FLAG_RTP 12
#define VOICE_CONTROL_REQ_MM_DEBUG_FLAG_DSP 14
#define VOICE_CONTROL_REQ_ICF_DEBUG_FLAG 16
+//Steve.2014-11-20 Support Log Dest
+#define VOICE_CONTROL_REQ_DEBUG_FLAG_DEST 17
package/public-zyxel/libzcfg_msg/patches/035-BUGFIX_firmwareUpgrade_not_errorFile_forZcfgMsgPart_SVD209.patch
Executable
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-12-10 16:28:58.441864736 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-12-10 16:35:24.650849878 +0800
@@ -56,6 +56,7 @@
#define ZCFG_MSG_CLEAN_ROMD 38
#define ZCFG_MSG_SAVE_ROMD 39
#define ZCFG_MSG_VOICE_LIST_ACCESS 40
+#define REQUEST_FIRMWARE_UPGRADE_CHK 41
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
package/public-zyxel/libzcfg_msg/patches/036-ENHANCE_add_mail_send_event.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-12-24 18:47:28.322348907 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-12-24 18:53:58.223258451 +0800
@@ -57,6 +57,7 @@
#define ZCFG_MSG_SAVE_ROMD 39
#define ZCFG_MSG_VOICE_LIST_ACCESS 40
#define REQUEST_FIRMWARE_UPGRADE_CHK 41
+#define ZCFG_MSG_MAIL_SEND_EVENT 42
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
package/public-zyxel/libzcfg_msg/patches/037-FEATURE_Auto_reserve_IP_for_the_same_host.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-12-26 16:08:43.927674950 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-12-26 16:10:17.599738378 +0800
@@ -123,6 +123,7 @@
#define ZCFG_MSG_AUTOHUNT_FINISH (53 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_ETHWAN_TR69_PROVISION_SUCCESS (54 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_VLAN_HUNT_TERMINATE (55 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_AUTO_RSV_IP (56 | ZCFG_NO_WAIT_REPLY)//ch_wang
/* end ZCFG message type */
package/public-zyxel/libzcfg_msg/patches/038-BUGFIX_configUpgrade_not_errorFile_forZcfgMsgPart_SVD209.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2014-12-29 09:56:49.829927309 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2014-12-29 10:03:10.047515396 +0800
@@ -58,6 +58,7 @@
#define ZCFG_MSG_VOICE_LIST_ACCESS 40
#define REQUEST_FIRMWARE_UPGRADE_CHK 41
#define ZCFG_MSG_MAIL_SEND_EVENT 42
+#define REQUEST_RESTORE_DEFAULT_CHK 43
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
package/public-zyxel/libzcfg_msg/patches/039-FEATURE_add_call_status_component_for_response_structure.patch
+21
View File
@@ -0,0 +1,21 @@
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2015-01-07 17:54:01.515484762 -0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2015-01-07 17:59:53.179474121 -0800
@@ -96,6 +96,16 @@
uint16_t mwiStatus; //bitmap: each bit (from the LSB), which represents NoMWI=0 & IsMWI=1, is corresponding to one SIP account/line. This can handle 16 SIP accounts/lines - SIP-00 ~ SIP-15.
uint32_t callState; //bitmap: every successive 3bit (from the LSB) as a set, which can represent 8 states, is corresponding to one Call. This can handle 10 Concurrent Calls - Call-00 ~ Call-09.
uint8_t fxsHookState; //bitmap: each bit (from the LSB), which represents OnHooked=0 & OffHooked=1, is corresponding to one FXS phone port. This can handle 8 FXS phone ports - FXS-00 ~ FXS-07.
+ //yushiuan add start , for to record the call status information, 2015/01/06
+ char status[64+1];
+ char callStartTime[128+1];
+ char selfNumber[512+1];
+ char peerNumber[512+1];
+ char codec[64+1];
+ char fromPhonePortType[64+1];
+ char toPhonePortType[64+1];
+ char callType[128+1];
+ //yushiuan add end , for to record the call status information, 2015/01/06
} voiceStatsRsp_t;
package/public-zyxel/libzcfg_msg/patches/040-ENHANCE_add_connection_ready_event.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-01-09 20:54:58.934393615 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-01-09 20:57:29.361702990 +0800
@@ -59,6 +59,7 @@
#define REQUEST_FIRMWARE_UPGRADE_CHK 41
#define ZCFG_MSG_MAIL_SEND_EVENT 42
#define REQUEST_RESTORE_DEFAULT_CHK 43
+#define ZCFG_MSG_WAN_CONNCTION_READY 44
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
package/public-zyxel/libzcfg_msg/patches/041-FEATURE_Voice_STATS_REQ_Add_VoipInUse.patch
Executable
+28
View File
@@ -0,0 +1,28 @@
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2015-02-10 09:52:40.634270132 +0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2015-02-10 10:14:51.613193618 +0800
@@ -64,6 +64,7 @@
#define VOICE_STATS_REQ_MWI_STATUS (1 << 1)
#define VOICE_STATS_REQ_CALL_STATE (1 << 2)
#define VOICE_STATS_REQ_FXS_HOOK_STATUS (1 << 3)
+#define VOICE_STATS_REQ_VOIP_INUSE (1 << 4)
typedef struct voiceStatsReq_s {
uint16_t bitFlag;
@@ -80,6 +81,7 @@
#define VOICE_STATS_RSP_MWI_STATUS (1 << 2)
#define VOICE_STATS_RSP_CALL_STATE (1 << 3)
#define VOICE_STATS_RSP_FXS_HOOK_STATUS (1 << 4)
+#define VOICE_STATS_RSP_VOIP_INUSE (1 << 5)
//------
#define VOICE_STATS_RSP_REGISTRATION_STATUS_SET_SIZE 8
#define VOICE_STATS_RSP_REGISTRATION_STATUS_MASK 0x0f
@@ -106,6 +108,7 @@
char toPhonePortType[64+1];
char callType[128+1];
//yushiuan add end , for to record the call status information, 2015/01/06
+ uint32_t voipInUse; //2015-02-10 Steve add.
} voiceStatsRsp_t;
package/public-zyxel/libzcfg_msg/patches/042-FEATURE_WDS_scan.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-02-13 10:20:22.374389646 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-02-13 10:20:51.925505723 +0800
@@ -60,6 +60,7 @@
#define ZCFG_MSG_MAIL_SEND_EVENT 42
#define REQUEST_RESTORE_DEFAULT_CHK 43
#define ZCFG_MSG_WAN_CONNCTION_READY 44
+#define ZCFG_MSG_WDS_SCAN 45
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
package/public-zyxel/libzcfg_msg/patches/043-ENHANCE_Voice_Stats_Get_OngoingCallCnt_HookStatusMap.patch
Executable
+58
View File
@@ -0,0 +1,58 @@
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2015-02-12 18:19:42.679762611 +0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2015-02-13 10:27:49.855201628 +0800
@@ -63,8 +63,9 @@
#define VOICE_STATS_REQ_REGISTRATION_STATUS (1 << 0)
#define VOICE_STATS_REQ_MWI_STATUS (1 << 1)
#define VOICE_STATS_REQ_CALL_STATE (1 << 2)
-#define VOICE_STATS_REQ_FXS_HOOK_STATUS (1 << 3)
+#define VOICE_STATS_REQ_PHONE_HOOK_STATUS (1 << 3)
#define VOICE_STATS_REQ_VOIP_INUSE (1 << 4)
+#define VOICE_STATS_REQ_ONGOING_CALL_CNT (1 << 5)
typedef struct voiceStatsReq_s {
uint16_t bitFlag;
@@ -80,8 +81,9 @@
#define VOICE_STATS_RSP_REGISTRATION_STATUS_SET2 (1 << 1)
#define VOICE_STATS_RSP_MWI_STATUS (1 << 2)
#define VOICE_STATS_RSP_CALL_STATE (1 << 3)
-#define VOICE_STATS_RSP_FXS_HOOK_STATUS (1 << 4)
+#define VOICE_STATS_RSP_PHONE_HOOK_STATUS (1 << 4)
#define VOICE_STATS_RSP_VOIP_INUSE (1 << 5)
+#define VOICE_STATS_RSP_ONGOING_CALL_CNT (1 << 6)
//------
#define VOICE_STATS_RSP_REGISTRATION_STATUS_SET_SIZE 8
#define VOICE_STATS_RSP_REGISTRATION_STATUS_MASK 0x0f
@@ -90,6 +92,7 @@
#define VOICE_STATS_RSP_CALL_STATE_SHIFT_UNIT 3
typedef struct voiceStatsRsp_s {
uint16_t bitFlag;
+ uint16_t errorBitFlag; //2015-02-13 Steve Add. Use RSP bit to indicate error. if all success will be 0
//NOTE: the following definitions SHOULD sync with those corresponding global variables in the 'vcm.c' of the ZyIMS VoIP's config system.
uint32_t registerStatusSet1; //bitmap: every successive 4bit (from the LSB) as a set, which can represent 10 statuses, is corresponding to one SIP account/line. This set can handle 8 SIP accounts/lines - SIP-00 ~ SIP-08.
@@ -97,7 +100,7 @@
//------
uint16_t mwiStatus; //bitmap: each bit (from the LSB), which represents NoMWI=0 & IsMWI=1, is corresponding to one SIP account/line. This can handle 16 SIP accounts/lines - SIP-00 ~ SIP-15.
uint32_t callState; //bitmap: every successive 3bit (from the LSB) as a set, which can represent 8 states, is corresponding to one Call. This can handle 10 Concurrent Calls - Call-00 ~ Call-09.
- uint8_t fxsHookState; //bitmap: each bit (from the LSB), which represents OnHooked=0 & OffHooked=1, is corresponding to one FXS phone port. This can handle 8 FXS phone ports - FXS-00 ~ FXS-07.
+ uint32_t phoneHookState; //bitmap: each bit (from the LSB), which represents OnHooked=0 & OffHooked=1, is corresponding to one FXS phone port. This can handle 8 FXS phone ports - FXS-00 ~ FXS-07.
//yushiuan add start , for to record the call status information, 2015/01/06
char status[64+1];
char callStartTime[128+1];
@@ -108,7 +111,14 @@
char toPhonePortType[64+1];
char callType[128+1];
//yushiuan add end , for to record the call status information, 2015/01/06
+
+
uint32_t voipInUse; //2015-02-10 Steve add.
+ //2015-02-13 Steve add.
+ uint8_t ongoingSipCallCnt;
+ uint8_t ongoingInternelCallCnt;
+ //2015-02-13 Steve add. (END)
+
} voiceStatsRsp_t;
package/public-zyxel/libzcfg_msg/patches/044-ENHANCE_add_wifi_sta_filter.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-02-12 21:13:44.036638784 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-02-12 21:13:44.056638533 +0800
@@ -126,6 +126,7 @@
#define ZCFG_MSG_ETHWAN_TR69_PROVISION_SUCCESS (54 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_VLAN_HUNT_TERMINATE (55 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_AUTO_RSV_IP (56 | ZCFG_NO_WAIT_REPLY)//ch_wang
+#define ZCFG_MSG_WIFI_STA_FILTER (57 | ZCFG_NO_WAIT_REPLY)
/* end ZCFG message type */
package/public-zyxel/libzcfg_msg/patches/045-ENHANCE_TR143_diagnostics.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-02-27 01:10:57.475629440 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-02-27 01:09:53.952443800 +0800
@@ -128,6 +128,7 @@
#define ZCFG_MSG_VLAN_HUNT_TERMINATE (55 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_AUTO_RSV_IP (56 | ZCFG_NO_WAIT_REPLY)//ch_wang
#define ZCFG_MSG_WIFI_STA_FILTER (57 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPLOAD_DIAG_COMPLETE_EVENT (58 | ZCFG_NO_WAIT_REPLY)
/* end ZCFG message type */
package/public-zyxel/libzcfg_msg/patches/046-EHANCE_WPS_hardware_button_press.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-03-09 21:33:52.788656858 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-03-09 21:35:33.565317292 +0800
@@ -129,6 +129,7 @@
#define ZCFG_MSG_AUTO_RSV_IP (56 | ZCFG_NO_WAIT_REPLY)//ch_wang
#define ZCFG_MSG_WIFI_STA_FILTER (57 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_UPLOAD_DIAG_COMPLETE_EVENT (58 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WPS_HWBTN_PRESS (59 | ZCFG_NO_WAIT_REPLY)
/* end ZCFG message type */
package/public-zyxel/libzcfg_msg/patches/047-EHANCE_change_sock_for_admin.patch
Executable
+40
View File
@@ -0,0 +1,40 @@
diff -Naur libzcfg_msg-1.0.orig/zcfg_msg.c libzcfg_msg-1.0/zcfg_msg.c
--- libzcfg_msg-1.0.orig/zcfg_msg.c 2015-03-24 15:09:55.949742700 +0800
+++ libzcfg_msg-1.0/zcfg_msg.c 2015-03-24 15:13:43.393171765 +0800
@@ -1,4 +1,5 @@
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <unistd.h>
@@ -69,6 +70,8 @@
close(myMsgfd);
return ZCFG_INTERNAL_ERROR;
}
+ chmod(saun.sun_path, 0777);
+
#if 0
if (listen(myMsgfd, ZCFG_MSG_BACKLOG) < 0) {
zcfgLog(ZCFG_LOG_ERR, "listen message socket error. In %s\n", __FUNCTION__);
@@ -276,7 +279,8 @@
free(sendMsg);
return -1;
}
-
+ chmod(clientaddr.sun_path, 0777);
+
saun.sun_family = AF_UNIX;
sprintf(saun.sun_path, "%s%hhu", ZCFG_ADDRESS_PREFIX, sendMsg->dstEid);
len = sizeof(saun);
diff -Naur libzcfg_msg-1.0.orig/zcfg_msg.h libzcfg_msg-1.0/zcfg_msg.h
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-03-24 15:09:56.129742700 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-03-24 14:02:09.466024300 +0800
@@ -133,7 +133,7 @@
/* end ZCFG message type */
-#define ZCFG_ADDRESS_PREFIX "/tmp/zcfg_sockaddr"
+#define ZCFG_ADDRESS_PREFIX "/var/lib/.sock/zcfg_sockaddr"
#define ZCFG_MSG_BACKLOG 5
typedef struct zcfgMsg_s {
package/public-zyxel/libzcfg_msg/patches/048-BUGFIX_5G_wireless_rate_show_wrong_value.patch
Executable
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-03-27 13:16:02.156520787 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-03-26 10:06:21.985014600 +0800
@@ -61,6 +61,7 @@
#define REQUEST_RESTORE_DEFAULT_CHK 43
#define ZCFG_MSG_WAN_CONNCTION_READY 44
#define ZCFG_MSG_WDS_SCAN 45
+#define ZCFG_MSG_WIFI_RADIO_ST_UPDATE 46
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
package/public-zyxel/libzcfg_msg/patches/049-EHANCE_update_wifi_lan_info.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-04-13 01:14:34.399796475 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-04-13 01:15:28.161623707 +0800
@@ -131,6 +131,7 @@
#define ZCFG_MSG_WIFI_STA_FILTER (57 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_UPLOAD_DIAG_COMPLETE_EVENT (58 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_WPS_HWBTN_PRESS (59 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WIFI_UPDATE_LANINFO (60 | ZCFG_NO_WAIT_REPLY)
/* end ZCFG message type */
package/public-zyxel/libzcfg_msg/patches/050-ENHANCE_move_channel_scan_from_zhttpd_to_zywifid.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-04-23 18:11:02.621290061 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-04-23 18:14:15.932622178 +0800
@@ -62,6 +62,8 @@
#define ZCFG_MSG_WAN_CONNCTION_READY 44
#define ZCFG_MSG_WDS_SCAN 45
#define ZCFG_MSG_WIFI_RADIO_ST_UPDATE 46
+#define ZCFG_MSG_CHANNEL_SCAN 47
+#define ZCFG_MSG_GET_CHANNEL_INFO 48
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
package/public-zyxel/libzcfg_msg/patches/051-FEATURE_ZCFGMSG_Web_Redirect.patch
+15
View File
@@ -0,0 +1,15 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-04-28 19:23:17.220779147 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-04-28 19:23:55.593961098 +0800
@@ -135,6 +135,10 @@
#define ZCFG_MSG_WPS_HWBTN_PRESS (59 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_WIFI_UPDATE_LANINFO (60 | ZCFG_NO_WAIT_REPLY)
+#if 1 /* __ZyXEL__, Albert, 20150416, Web redirect */
+#define ZCFG_MSG_WIFI_WEB_REDIRECT_CHECK (61 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PPP_AUTH_FAIL (62 | ZCFG_NO_WAIT_REPLY)
+#endif
/* end ZCFG message type */
#define ZCFG_ADDRESS_PREFIX "/var/lib/.sock/zcfg_sockaddr"
package/public-zyxel/libzcfg_msg/patches/052-ENHANCE_name_mapping.patch
+16
View File
@@ -0,0 +1,16 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-05-13 17:31:07.444737522 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-05-13 17:33:47.361140700 +0800
@@ -73,6 +73,11 @@
#define ZCFG_MSG_HELLO 102
#define ZCFG_MSG_NO_REPLY (101 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_REQUEST_TR98_OBJMAPPING 103
+#define ZCFG_MSG_REQUEST_TR181_OBJMAPPING 104
+#define ZCFG_MSG_NOTIFY_TR69_TR98 (105 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_ADD_TR98_MAPPING 106
+
/* ZCFG message type without waiting reply*/
#define ZCFG_MSG_LAN_IP_CONNECTION_UP (1 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_DHCPC_BOUND (2 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/053-ENHANCE_update_host_info.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-05-20 10:36:45.936000847 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-05-20 10:38:06.859208397 +0800
@@ -144,6 +144,7 @@
#define ZCFG_MSG_WIFI_WEB_REDIRECT_CHECK (61 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_PPP_AUTH_FAIL (62 | ZCFG_NO_WAIT_REPLY)
#endif
+#define ZCFG_MSG_UPDATE_ONE_CONNECT (63 | ZCFG_NO_WAIT_REPLY)
/* end ZCFG message type */
#define ZCFG_ADDRESS_PREFIX "/var/lib/.sock/zcfg_sockaddr"
package/public-zyxel/libzcfg_msg/patches/054-FEATURE_PPP_LCP_ECHO_config_byTR069.patch
+14
View File
@@ -0,0 +1,14 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-05-21 16:42:00.538741122 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-05-21 16:44:06.160282971 +0800
@@ -64,6 +64,9 @@
#define ZCFG_MSG_WIFI_RADIO_ST_UPDATE 46
#define ZCFG_MSG_CHANNEL_SCAN 47
#define ZCFG_MSG_GET_CHANNEL_INFO 48
+#if 1 /* __ZyXEL__, Albert, 20150520, Supports PPPoE Connection Delay and LCP Echo */
+#define ZCFG_MSG_PPP_LCP_ECHO_GET 46
+#endif
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
package/public-zyxel/libzcfg_msg/patches/056-ENHANCE_parameter_mapping.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-05-27 19:05:10.802793700 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-05-27 19:08:39.030440200 +0800
@@ -80,6 +80,7 @@
#define ZCFG_MSG_REQUEST_TR181_OBJMAPPING 104
#define ZCFG_MSG_NOTIFY_TR69_TR98 (105 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_ADD_TR98_MAPPING 106
+#define ZCFG_MSG_UPDATE_PARAMETER_NOTIFY (120 | ZCFG_NO_WAIT_REPLY)
/* ZCFG message type without waiting reply*/
#define ZCFG_MSG_LAN_IP_CONNECTION_UP (1 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/057-EHANCE_add_zywifid_control_msg.patch
+63
View File
@@ -0,0 +1,63 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-05-26 19:22:18.153097003 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-06-10 19:47:35.428133650 +0800
@@ -50,7 +50,6 @@
#define REQUEST_REINIT_MACLESS_PROVISIONING 32
#define ZCFG_MSG_DECT_CONTROL 33
#define ZCFG_MSG_DECT_STATS_GET 34
-#define ZCFG_MSG_WIFI_RELOAD_CHECK 35
#define ZCFG_MSG_GET_TR98_ALL_IGD_NAMES 36
#define ZCFG_MSG_MCPCTL 37
#define ZCFG_MSG_CLEAN_ROMD 38
@@ -60,10 +59,7 @@
#define ZCFG_MSG_MAIL_SEND_EVENT 42
#define REQUEST_RESTORE_DEFAULT_CHK 43
#define ZCFG_MSG_WAN_CONNCTION_READY 44
-#define ZCFG_MSG_WDS_SCAN 45
-#define ZCFG_MSG_WIFI_RADIO_ST_UPDATE 46
-#define ZCFG_MSG_CHANNEL_SCAN 47
-#define ZCFG_MSG_GET_CHANNEL_INFO 48
+
#if 1 /* __ZyXEL__, Albert, 20150520, Supports PPPoE Connection Delay and LCP Echo */
#define ZCFG_MSG_PPP_LCP_ECHO_GET 46
#endif
@@ -130,18 +126,32 @@
#define ZCFG_MSG_DOWNLOAD_DIAG_COMPLETE_EVENT (46 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_TR64_LAN_DEVICE_UPDATE (47 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_VOICE_CONFIG_CHANGED_PARTIAL_RELOAD (48 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WIFI_RELOAD (49 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WPS_RELOAD (50 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WIFI_LED_ENABLE (51 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_DHCPC_RENEW (52 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_AUTOHUNT_FINISH (53 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_ETHWAN_TR69_PROVISION_SUCCESS (54 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_VLAN_HUNT_TERMINATE (55 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_AUTO_RSV_IP (56 | ZCFG_NO_WAIT_REPLY)//ch_wang
-#define ZCFG_MSG_WIFI_STA_FILTER (57 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_UPLOAD_DIAG_COMPLETE_EVENT (58 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WPS_HWBTN_PRESS (59 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WIFI_UPDATE_LANINFO (60 | ZCFG_NO_WAIT_REPLY)
+
+
+/* WIFI message */
+#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WIFI_RELOAD (501 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WIFI_UPDATE_LANINFO (502 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WIFI_GET_LIST 503
+#define ZCFG_MSG_WPS_RELOAD (504 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WPS_HWBTN_PRESS 505
+#define ZCFG_MSG_WPS_SWBTN_PRESS 506
+#define ZCFG_MSG_WPS_START_STAPIN 507
+#define ZCFG_MSG_WDS_SCAN 508
+#define ZCFG_MSG_WIFI_STA_FILTER (509 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_CHANNEL_SCAN 510
+#define ZCFG_MSG_GET_CHANNEL_INFO 511
+#define ZCFG_MSG_WIFI_ST_UPDATE 512
+#define ZCFG_MSG_WIFI_RELOAD_CHECK 513
+#define ZCFG_MSG_WIFI_LED_ENABLE (514 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WPS_ACTION_CANCEL 515
+#define ZCFG_MSG_WPS_UPDATE_CONFIG 516
#if 1 /* __ZyXEL__, Albert, 20150416, Web redirect */
#define ZCFG_MSG_WIFI_WEB_REDIRECT_CHECK (61 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/058-FEATURE_add_dhcp_Option125.patch
+14
View File
@@ -0,0 +1,14 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-06-22 17:02:48.958334420 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-06-22 17:04:02.075473494 +0800
@@ -63,6 +63,9 @@
#if 1 /* __ZyXEL__, Albert, 20150520, Supports PPPoE Connection Delay and LCP Echo */
#define ZCFG_MSG_PPP_LCP_ECHO_GET 46
#endif
+/* __ZyXEL__, Albert, 20150622, Support DHCP option125 */
+#define ZCFG_MSG_DHCP_OPTIONI125_CHK 49
+
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
package/public-zyxel/libzcfg_msg/patches/059-BUGFIX_CrossPlatform_Remove_dummy_Makefile_content.patch
Executable
+31
View File
@@ -0,0 +1,31 @@
Index: libzcfg_msg-1.0/Makefile
===================================================================
--- libzcfg_msg-1.0.orig/Makefile 2015-06-08 11:25:54.551407456 +0800
+++ libzcfg_msg-1.0/Makefile 2015-06-08 11:27:10.603406895 +0800
@@ -1,5 +1,4 @@
CURRENT_DIR = $(shell pwd)
-#COMMON_ZCFG_INCLUDE_DIR = $(CURRENT_DIR)/../../../private/apps/zcfg/include
.PHONY : libzcfg_msg
@@ -9,18 +8,8 @@
$(CC) -shared -o libzcfg_msg.so zcfg_msg.o
zcfg_msg.o : zcfg_msg.c
- $(CC) -c -fPIC zcfg_msg.c -Wall -L$(USRLIBDIR) -L$(INSTALL_DIR)/lib/public -L$(INSTALL_DIR)/lib/private\
- -I$(TOOLCHAIN)/include -I$(COMMON_ZCFG_INCLUDE_DIR) -I. -std=gnu99
-
-install:
- install -m 755 libzcfg_msg.so $(INSTALL_DIR)/lib/public
- install -m 666 zcfg_msg.h $(COMMON_ZCFG_INCLUDE_DIR)
- install -m 666 zcfg_msg_voice.h $(COMMON_ZCFG_INCLUDE_DIR)
- install -m 666 zcfg_msg_dect.h $(COMMON_ZCFG_INCLUDE_DIR)
+ $(CC) -c -fPIC zcfg_msg.c -Wall -I$(TOOLCHAIN)/include -I. -std=gnu99
clean:
rm -rf *.o
rm -rf *.so
- rm -rf $(COMMON_ZCFG_INCLUDE_DIR)/zcfg_msg.h
- rm -rf $(COMMON_ZCFG_INCLUDE_DIR)/zcfg_msg_voice.h
- rm -rf $(COMMON_ZCFG_INCLUDE_DIR)/zcfg_msg_dect.h
\ No newline at end of file
package/public-zyxel/libzcfg_msg/patches/060-ENHANCE_support_zywlctl_message_type.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-07-28 18:57:51.309585372 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-07-28 18:59:23.445779582 +0800
@@ -156,6 +156,8 @@
#define ZCFG_MSG_WIFI_LED_ENABLE (514 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_WPS_ACTION_CANCEL 515
#define ZCFG_MSG_WPS_UPDATE_CONFIG 516
+#define ZCFG_MSG_WLAN_GET_CMD 520
+#define ZCFG_MSG_WLAN_SET_CMD 521
#if 1 /* __ZyXEL__, Albert, 20150416, Web redirect */
#define ZCFG_MSG_WIFI_WEB_REDIRECT_CHECK (61 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/061-BUGFIX_dnsmasq_block_issue.patch
+21
View File
@@ -0,0 +1,21 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-08-14 18:24:23.512158000 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-08-14 18:25:06.208427200 +0800
@@ -41,7 +41,7 @@
#define REQUEST_GET_OBJ_WITHOUT_UPDATE 23
#define REQUEST_CONFIG_BACKUP 24
#define ZCFG_MSG_UPNP_PORTMAP_GET 25
-#define ZCFG_MSG_DHCPD_OPTION 26
+
#define REQUEST_GET_NEXT_OBJ_WITHOUT_UPDATE 27
#define REQUEST_GET_NEXT_SUB_WITHOUT_UPDATE 28
#define ZCFG_MSG_VOICE_STATS_GET 29
@@ -136,6 +136,7 @@
#define ZCFG_MSG_VLAN_HUNT_TERMINATE (55 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_AUTO_RSV_IP (56 | ZCFG_NO_WAIT_REPLY)//ch_wang
#define ZCFG_MSG_UPLOAD_DIAG_COMPLETE_EVENT (58 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DHCPD_OPTION (59 | ZCFG_NO_WAIT_REPLY)
/* WIFI message */
package/public-zyxel/libzcfg_msg/patches/062-ENHANCE_Voice_message_to_support_VoIP_Do_type_Control_CLI.patch
Executable
+324
View File
@@ -0,0 +1,324 @@
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2015-09-16 16:59:46.983517504 +0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2015-09-14 15:05:54.000489500 +0800
@@ -9,18 +9,19 @@
//Michael.20140625.001.B: Add.
/************************/
-/*** Voice Config Change ***/
+/*** Voice Config Change ***/ //<==> ZCFG_MSG_VOICE_STATIC_CONFIG_CHANGED.
/************************/
//*** Voice Config Change REQuest ***
#define VOICE_CONFIG_REQ_SIP_LINE_ACTIVATE (1 << 0)
-//------
+//======
#define VOICE_CONFIG_REQ_SIP_ACCT_MAX VOICE_SIP_ACCT_MAX
#define VOICE_CONFIG_REQ_SIP_LINE_ACTIVATE_NO_ACTION 0
#define VOICE_CONFIG_REQ_SIP_LINE_ACTIVATE_ENABLE 1
#define VOICE_CONFIG_REQ_SIP_LINE_ACTIVATE_DISABLE 2
#define VOICE_CONFIG_REQ_SIP_LINE_ACTIVATE_MASK 0x03
#define VOICE_CONFIG_REQ_SIP_LINE_ACTIVATE_SHIFT_UNIT 2
+//======
typedef struct voiceConfigReq_s {
uint16_t bitFlag;
@@ -31,7 +32,7 @@
/*************************************/
-/*** Voice Config Change Partial Reload ***/
+/*** Voice Config Change Partial Reload ***/ //<==> ZCFG_MSG_VOICE_CONFIG_CHANGED_PARTIAL_RELOAD.
/*************************************/
#define VOICE_CONFIG_CHANGED_PARTIAL_RELOAD_PARA_MAX 3
@@ -40,23 +41,23 @@
//*** Voice config change partial load flag for DECT ***
#define DECT_PARTIAL_RELOAD_FLAG_BS_FUNCTION_ENABLE (1 << 0)
-#define DECT_PARTIAL_RELOAD_FLAG_BS_NAME (1 << 1)
-#define DECT_PARTIAL_RELOAD_FLAG_BS_PIN_CODE (1 << 2)
+#define DECT_PARTIAL_RELOAD_FLAG_BS_NAME (1 << 1)
+#define DECT_PARTIAL_RELOAD_FLAG_BS_PIN_CODE (1 << 2)
#define DECT_PARTIAL_RELOAD_FLAG_BS_ENCRYPTION_ENABLE (1 << 3)
#define DECT_PARTIAL_RELOAD_FLAG_BS_NEMO_ENABLE (1 << 4)
#define DECT_PARTIAL_RELOAD_FLAG_BS_ECO_MODE_ENABLE (1 << 5)
#define DECT_PARTIAL_RELOAD_FLAG_BS_RF_STRENGTH (1 << 6)
#define DECT_PARTIAL_RELOAD_FLAG_BS_REGISTRATION_DURATION (1 << 7)
#define DECT_PARTIAL_RELOAD_FLAG_BS_PAGING_DURATION (1 << 8)
-
-#define DECT_PARTIAL_RELOAD_FLAG_HS_NAME (1 << 9)
-#define DECT_PARTIAL_RELOAD_FLAG_HS_INTERNAL_PHONE_NUM (1 << 10)
-#define DECT_PARTIAL_RELOAD_FLAG_HS_LINE_SELECT (1 << 11)
+//------
+#define DECT_PARTIAL_RELOAD_FLAG_HS_NAME (1 << 9)
+#define DECT_PARTIAL_RELOAD_FLAG_HS_INTERNAL_PHONE_NUM (1 << 10)
+#define DECT_PARTIAL_RELOAD_FLAG_HS_LINE_SELECT (1 << 11)
/***********************/
-/*** Voice Stats Update ***/
+/*** Voice Stats Update ***/ //<==> ZCFG_MSG_VOICE_STATS_GET.
/***********************/
//*** Voice Stats Update REQuest ***
@@ -66,6 +67,7 @@
#define VOICE_STATS_REQ_PHONE_HOOK_STATUS (1 << 3)
#define VOICE_STATS_REQ_VOIP_INUSE (1 << 4)
#define VOICE_STATS_REQ_ONGOING_CALL_CNT (1 << 5)
+//======
typedef struct voiceStatsReq_s {
uint16_t bitFlag;
@@ -83,13 +85,14 @@
#define VOICE_STATS_RSP_CALL_STATE (1 << 3)
#define VOICE_STATS_RSP_PHONE_HOOK_STATUS (1 << 4)
#define VOICE_STATS_RSP_VOIP_INUSE (1 << 5)
-#define VOICE_STATS_RSP_ONGOING_CALL_CNT (1 << 6)
-//------
+#define VOICE_STATS_RSP_ONGOING_CALL_CNT (1 << 6)
+//======
#define VOICE_STATS_RSP_REGISTRATION_STATUS_SET_SIZE 8
#define VOICE_STATS_RSP_REGISTRATION_STATUS_MASK 0x0f
#define VOICE_STATS_RSP_REGISTRATION_STATUS_SHIFT_UNIT 4
#define VOICE_STATS_RSP_CALL_STATE_MASK 0x07
#define VOICE_STATS_RSP_CALL_STATE_SHIFT_UNIT 3
+//======
typedef struct voiceStatsRsp_s {
uint16_t bitFlag;
uint16_t errorBitFlag; //2015-02-13 Steve Add. Use RSP bit to indicate error. if all success will be 0
@@ -101,7 +104,7 @@
uint16_t mwiStatus; //bitmap: each bit (from the LSB), which represents NoMWI=0 & IsMWI=1, is corresponding to one SIP account/line. This can handle 16 SIP accounts/lines - SIP-00 ~ SIP-15.
uint32_t callState; //bitmap: every successive 3bit (from the LSB) as a set, which can represent 8 states, is corresponding to one Call. This can handle 10 Concurrent Calls - Call-00 ~ Call-09.
uint32_t phoneHookState; //bitmap: each bit (from the LSB), which represents OnHooked=0 & OffHooked=1, is corresponding to one FXS phone port. This can handle 8 FXS phone ports - FXS-00 ~ FXS-07.
- //yushiuan add start , for to record the call status information, 2015/01/06
+ //yushiuan add start , for to record the call status information, 2015/01/06
char status[64+1];
char callStartTime[128+1];
char selfNumber[512+1];
@@ -110,97 +113,182 @@
char fromPhonePortType[64+1];
char toPhonePortType[64+1];
char callType[128+1];
- //yushiuan add end , for to record the call status information, 2015/01/06
-
+ //yushiuan add end , for to record the call status information, 2015/01/06
- uint32_t voipInUse; //2015-02-10 Steve add.
- //2015-02-13 Steve add.
+ uint32_t voipInUse; //2015-02-10 Steve add.
+ //2015-02-13 Steve add.
uint8_t ongoingSipCallCnt;
uint8_t ongoingInternelCallCnt;
//2015-02-13 Steve add. (END)
-
} voiceStatsRsp_t;
/******************/
-/*** Voice Control ***/
+/*** Voice Control ***/ //<==> ZCFG_MSG_VOICE_CONTROL.
/******************/
//Michael.20131125.001.B: Add.
//*** Voice Control REQuest ***
#define VOICE_CONTROL_REQ_CONVENTIONAL_VOIP_CLI (1 << 0)
+//------
#define VOICE_CONTROL_REQ_SIP_REGISTER (1 << 1)
+//------
//Steve.2014-06-11 ADD
#define VOICE_CONTROL_REQ_GET_DEBUG_FLAG (1 << 2)
#define VOICE_CONTROL_REQ_SET_DEBUG_FLAG (1 << 3)
#define VOICE_CONTROL_REQ_SET_ICF_DEBUG_FLAG (1 << 4)
-#define VOICE_CONTROL_REQ_SET_MM_DEBUG_FLAG (1 << 5)
+#define VOICE_CONTROL_REQ_SET_MM_DEBUG_FLAG (1 << 5)
//Steve.2014-11-20 Support Log Dest
#define VOICE_CONTROL_REQ_SET_DEBUG_DEST (1 << 6)
//------
+#if 1 //Michael.20150909.001.B: Add to support the CLI (framework): Tone, Ring, LED and VMWI signal control.
+#define VOICE_CONTROL_REQ_PHONE_TONE (1 << 7)
+#define VOICE_CONTROL_REQ_PHONE_RING (1 << 8)
+#define VOICE_CONTROL_REQ_PHONE_LED (1 << 9)
+#define VOICE_CONTROL_REQ_PHONE_VMWI (1 << 10)
+#endif //Michael.20150909.001.E: Add.
+//======
#define VOICE_CONTROL_REQ_SIP_REGISTER_SIP_ACCT_MAX VOICE_SIP_ACCT_MAX //Michael.20140625.001: Modify from '16' to 'VOICE_SIP_ACCT_MAX'.
#define VOICE_CONTROL_REQ_SIP_REGISTER_NO_ACTION 0
#define VOICE_CONTROL_REQ_SIP_REGISTER_DO_REGISTER 1
#define VOICE_CONTROL_REQ_SIP_REGISTER_DO_DEREGISTER 2
#define VOICE_CONTROL_REQ_SIP_REGISTER_ACTION_MASK 0x03
#define VOICE_CONTROL_REQ_SIP_REGISTER_ACTION_SHIFT_UNIT 2
+//------
//Steve.2014-06-11 ADD to define Debug Flag
-#define VOICE_CONTROL_REQ_DEBUG_FLAG_MASK 0x3
+#define VOICE_CONTROL_REQ_DEBUG_FLAG_MASK 0x03 //bitmap: every successive 2bit (from the LSB) as a set, which can represent 4 states, is corresponding to 4 debug levels (including the 'Disabled').
#define VOICE_CONTROL_REQ_DEBUG_FLAG_VOICEAPP 0
#define VOICE_CONTROL_REQ_DEBUG_FLAG_CCM 2
#define VOICE_CONTROL_REQ_DEBUG_FLAG_PHONE 4
#define VOICE_CONTROL_REQ_DEBUG_FLAG_SIP 6
#define VOICE_CONTROL_REQ_DEBUG_FLAG_TR104 8
//Steve.2014-09-04 Define MM & ICF Debug Flag
-#define VOICE_CONTROL_REQ_MM_DEBUG_FLAG_RM 10
-#define VOICE_CONTROL_REQ_MM_DEBUG_FLAG_RTP 12
-#define VOICE_CONTROL_REQ_MM_DEBUG_FLAG_DSP 14
-#define VOICE_CONTROL_REQ_ICF_DEBUG_FLAG 16
+#define VOICE_CONTROL_REQ_MM_DEBUG_FLAG_RM 10 // TODO: SHOULD rename to 'VOICE_CONTROL_REQ_DEBUG_FLAG_MM_RM'!
+#define VOICE_CONTROL_REQ_MM_DEBUG_FLAG_RTP 12 // TODO: SHOULD rename to 'VOICE_CONTROL_REQ_DEBUG_FLAG_MM_RTP'!
+#define VOICE_CONTROL_REQ_MM_DEBUG_FLAG_DSP 14 // TODO: SHOULD rename to 'VOICE_CONTROL_REQ_DEBUG_FLAG_MM_DSP'!
+#define VOICE_CONTROL_REQ_ICF_DEBUG_FLAG 16 // TODO: SHOULD rename to 'VOICE_CONTROL_REQ_DEBUG_FLAG_ICF'!
//Steve.2014-11-20 Support Log Dest
-#define VOICE_CONTROL_REQ_DEBUG_FLAG_DEST 17
-
-
-
-
-
-
+#define VOICE_CONTROL_REQ_DEBUG_FLAG_DEST 18 //Correct from 17 to 18!
+//------
+#if 1 //Michael.20150909.001.B: Add to support the CLI (framework): Tone, Ring, LED and VMWI signal control.
+//+------------+--------+----------+----------+
+//| 15------11 | 10---8 | 7------4 | 3------0 |
+//+------------+--------+----------+----------+
+//: ToneId : Action : Port : Port :
+//: RingId : : PhyId : Type :
+#define VOICE_CONTROL_REQ_PHONE_CTRL_DATA_MASK_3BIT 0x07 //0000-0111.
+#define VOICE_CONTROL_REQ_PHONE_CTRL_DATA_MASK_4BIT 0x0F //0000-1111.
+#define VOICE_CONTROL_REQ_PHONE_CTRL_DATA_MASK_5BIT 0x1F //0001-1111.
+#define VOICE_CONTROL_REQ_PHONE_PORT_TYPE_SHIFT_UNIT 0
+#define VOICE_CONTROL_REQ_PHONE_PORT_PHYID_SHIFT_UNIT 4
+#define VOICE_CONTROL_REQ_PHONE_PORT_ACT_SHIFT_UNIT 8
+#define VOICE_CONTROL_REQ_PHONE_TONERING_ID_SHIFT_UNIT 11 //Support Action Cnt: (0x07)=7, Tone/Ring Id Cnt: (0x1F)=31.
+#define VOICE_CONTROL_REQ_PHONE_LED_ID_SHIFT_UNIT 12 //Support Action Cnt: (0x0F)=15, LED Id Cnt: (0x0F)=15. //Michael.20151213.001: Add.
+//------
+#define VOICE_CONTROL_REQ_PHONE_ACT_NONE 0x07
+#define VOICE_CONTROL_REQ_PHONE_ACT_NONE2 0x0F //Michael.20151213.001: Add.
+//------
+#define VOICE_CONTROL_REQ_PHONE_TONERING_PLAY_OFF 0
+#define VOICE_CONTROL_REQ_PHONE_TONERING_PLAY_ON 1
+//------
+#define VOICE_CONTROL_REQ_PHONE_VMWI_OFF 0
+#define VOICE_CONTROL_REQ_PHONE_VMWI_ON 1
+//------
+#define VOICE_CONTROL_REQ_PHONE_LED_OFF 0
+#define VOICE_CONTROL_REQ_PHONE_LED_ON 1
+#define VOICE_CONTROL_REQ_PHONE_LED_BLINK 2 //Michael.20151213.001: Add.
+#define VOICE_CONTROL_REQ_PHONE_LED_SLOW_BLINK 3
+#define VOICE_CONTROL_REQ_PHONE_LED_FAST_BLINK 4
+#define VOICE_CONTROL_REQ_PHONE_LED_FAIL 5
+#define VOICE_CONTROL_REQ_PHONE_LED_AUTO 6 //Michael.20151213.001: Add.
+#define VOICE_CONTROL_REQ_PHONE_LED_STATUS_DISP 7 //Michael.20151213.001: Add.
+#endif //Michael.20150909.001.E: Add.
+//Michael.20150909.001.E: Add.
+//======
#ifdef ZYXEL_ZYIMS_CMD_TEST //__ZYXEL__, Mark
typedef enum{
VOICE_CLI_ZYIMSCMD
}voiceCliType;
-#endif
-
+#endif //ZYXEL_ZYIMS_CMD_TEST.
+//------
typedef struct voiceCtrlReq_s {
uint32_t bitFlag;
//NOTE: No fixed (string-type) parameter for the conventional VoIP CLI command string is defined here, because it will be appended at the end of the structure as a payload.
uint32_t sipRegisterAct; //bitmap: every successive 2bit (from the LSB) as a set, which can represent 4 statuses, is corresponding to one SIP account/line's register action. Markup dedicated set to indicate requesting its corresponding SIP account/line's SIP regiter action. This is designed to support 16 SIP accounts/lines - SIP-00 ~ SIP-15.
+ //------
uint32_t DebugFlag; //Steve.2014-06-11-1013
- uint32_t DataValue; //Pass the data value to CLI "get" command 2014-06-11 Steve.
+ uint32_t DataValue; //Pass the data value to CLI "get" command 2014-06-11 Steve.
+ //------
+ //Michael.20150909.001.B: Add to support the CLI (framework): Tone, Ring, LED and VMWI signal control.
+ //+------------+--------+----------+----------+
+ //| 15------11 | 10---8 | 7------4 | 3------0 |
+ //+------------+--------+----------+----------+
+ //: ToneId : Action : Port : Port :
+ //: RingId : : PhyId : Type :
+#define MAX_CLID_NUMBER 40
+ uint32_t phoneToneCtrl;
+ char callerId_number_callWait[MAX_CLID_NUMBER+1];
+
+ uint32_t phoneRingCtrl;
+ char callerId_number_ring[MAX_CLID_NUMBER+1];
+
+ uint32_t phoneLedCtrl;
+ uint32_t phoneVmwiCtrl;
+ //Michael.20150909.001.E: Add.
+
+ //------
#ifdef ZYXEL_ZYIMS_CMD_TEST //__ZYXEL__, Mark
voiceCliType cliType;
char cmdLine[200];
-#endif
+#endif //ZYXEL_ZYIMS_CMD_TEST.
} voiceCtrlReq_t;
//*** Voice Control ReSPonse ***
#define VOICE_CONTROL_RSP_CONVENTIONAL_VOIP_CLI (1 << 0)
+//------
#define VOICE_CONTROL_RSP_SIP_REGISTER (1 << 1)
//------
+//Steve.2014-06-11 ADD
+#define VOICE_CONTROL_RSP_GET_DEBUG_FLAG (1 << 2)
+#define VOICE_CONTROL_RSP_SET_DEBUG_FLAG (1 << 3)
+#define VOICE_CONTROL_RSP_SET_ICF_DEBUG_FLAG (1 << 4)
+#define VOICE_CONTROL_RSP_SET_MM_DEBUG_FLAG (1 << 5)
+//Steve.2014-11-20 Support Log Dest
+#define VOICE_CONTROL_RSP_SET_DEBUG_DEST (1 << 6)
+//------
+#if 1 //Michael.20150909.001.B: Add to support the CLI (framework): Tone, Ring, LED and VMWI signal control.
+#define VOICE_CONTROL_RSP_PHONE_TONE (1 << 7)
+#define VOICE_CONTROL_RSP_PHONE_RING (1 << 8)
+#define VOICE_CONTROL_RSP_PHONE_LED (1 << 9)
+#define VOICE_CONTROL_RSP_PHONE_VMWI (1 << 10)
+#endif //Michael.20150909.001.E: Add.
+//======
#define VOICE_CONTROL_RSP_ACT_SUCCESS 0
#define VOICE_CONTROL_RSP_ACT_FAIL 1
+//======
typedef struct voiceCtrlRsp_s {
- uint32_t bitFlag;
+ uint32_t bitFlag;
//NOTE: No fixed (string-type) parameter for the conventional VoIP CLI result string is defined here, because it will be appended at the end of the structure as a payload.
+ //------
uint16_t sipRegisterActResult; //bitmap: each bit (from the LSB), which represents ActionSuccess=0 & ActionFail=1, is corresponding to one SIP account/line's register action result.
- uint32_t DataValue; //Pass the data value to CLI "get" command 2014-06-11 Steve.
+ //------
+ uint32_t DataValue; //Pass the data value to CLI "get" command 2014-06-11 Steve.
+ //------
+ //Michael.20150909.001.B: Add to support the CLI (framework): Tone, Ring, LED and VMWI signal control.
+ uint8_t phoneToneCtrlResult;
+ uint8_t phoneRingCtrlResult;
+ uint8_t phoneLedCtrlResult;
+ uint8_t phoneVmwiCtrlResult;
+ //Michael.20150909.001.E: Add.
} voiceCtrlRsp_t;
//Michael.20131125.001.B: Add.
+
/**************Voice List Access Msg*******************/
//Types
#define VOICE_LIST_ACCESS_REQ_CALLHISTORY_GET (1 << 0)
@@ -212,12 +295,13 @@
#define VOICE_LIST_ACCESS_REQ_PHONEBOOK_PUT (1 << 6)
#define VOICE_LIST_ACCESS_REQ_PHONEBOOK_CLEAR (1 << 7)
#define VOICE_LIST_ACCESS_REQ_PHONEBOOK_BACKUP (1 << 8)
-#define VOICE_LIST_ACCESS_REQ_PHONEBOOK_RESTORE (1 << 9)
-
+#define VOICE_LIST_ACCESS_REQ_PHONEBOOK_RESTORE (1 << 9)
+//======
typedef struct voiceListAccessReq_s{
uint16_t Type;
char *Payload; //Request Data From GUI, Only PUT Method
}voiceListAccessReq_t;
+//------
typedef struct voiceListAccessRsp_s{
char *Payload;
}voiceListAccessRsp_t;
package/public-zyxel/libzcfg_msg/patches/063-ENHANCE_Voice_add_cap_get_msg.patch
Executable
+36
View File
@@ -0,0 +1,36 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2015-09-22 11:25:07.545177783 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2015-09-22 11:25:07.701177790 +0800
@@ -65,6 +65,8 @@
#endif
/* __ZyXEL__, Albert, 20150622, Support DHCP option125 */
#define ZCFG_MSG_DHCP_OPTIONI125_CHK 49
+#define ZCFG_MSG_VOICE_CAP_GET 50
+
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2015-09-22 11:25:07.545177783 +0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2015-09-22 11:25:07.701177790 +0800
@@ -224,4 +224,18 @@
//Steve.2014-09-23
+
+/*********************CAP Get***********************/
+#define VOICE_CAP_GET_REGION (1 << 0)
+#define VOICE_CAP_GET_CODEC (1 << 1)
+
+typedef struct voiceCapGetReq_s{
+ uint16_t Type;
+}voiceCapGetReq_t;
+typedef struct voiceCapGetResp_s{
+ char *Payload;
+}voiceCapGetResp_t;
+//Steve.2015-09-17
+
+
#endif //_ZCFG_MSG_VOICE_H
package/public-zyxel/libzcfg_msg/patches/064-ENHANCE_Add_voice_line_statistics_for_tr69.patch
Executable
+39
View File
@@ -0,0 +1,39 @@
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2015-12-10 12:02:53.999871757 +0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2015-12-10 14:11:03.286063700 +0800
@@ -1,7 +1,7 @@
#ifndef _ZCFG_MSG_VOICE_H
#define _ZCFG_MSG_VOICE_H
#include "zcfg_common.h"
-
+#include "zcfg_rdm_obj.h"
#define ZCFG_MSG_VOICE_REPLY_WAIT_TIMEOUT 2000 //ms
#define VOICE_SIP_ACCT_MAX 16 //Michael.20140625.001: Add.
@@ -67,6 +67,7 @@
#define VOICE_STATS_REQ_PHONE_HOOK_STATUS (1 << 3)
#define VOICE_STATS_REQ_VOIP_INUSE (1 << 4)
#define VOICE_STATS_REQ_ONGOING_CALL_CNT (1 << 5)
+#define VOICE_STATS_REQ_VOICE_LINE_STATS (1 << 6)
//======
typedef struct voiceStatsReq_s {
uint16_t bitFlag;
@@ -86,6 +87,7 @@
#define VOICE_STATS_RSP_PHONE_HOOK_STATUS (1 << 4)
#define VOICE_STATS_RSP_VOIP_INUSE (1 << 5)
#define VOICE_STATS_RSP_ONGOING_CALL_CNT (1 << 6)
+#define VOICE_STATS_RSP_VOICE_LINE_STATS (1 << 7)
//======
#define VOICE_STATS_RSP_REGISTRATION_STATUS_SET_SIZE 8
#define VOICE_STATS_RSP_REGISTRATION_STATUS_MASK 0x0f
@@ -120,6 +122,9 @@
uint8_t ongoingSipCallCnt;
uint8_t ongoingInternelCallCnt;
//2015-02-13 Steve add. (END)
+
+ //2015-12-09 Brady add
+ rdm_VoiceLineStats_t LineStats;
} voiceStatsRsp_t;
package/public-zyxel/libzcfg_msg/patches/065-ENHANCE_Add_voice_line_statistics_for_tr69_2.patch
Executable
+21
View File
@@ -0,0 +1,21 @@
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2015-12-15 17:41:53.014611458 +0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2015-12-15 17:43:53.980277200 +0800
@@ -153,6 +153,7 @@
#define VOICE_CONTROL_REQ_PHONE_LED (1 << 9)
#define VOICE_CONTROL_REQ_PHONE_VMWI (1 << 10)
#endif //Michael.20150909.001.E: Add.
+#define VOICE_CONTROL_REQ_VOICE_LINE_STATS (1 << 11)
//======
#define VOICE_CONTROL_REQ_SIP_REGISTER_SIP_ACCT_MAX VOICE_SIP_ACCT_MAX //Michael.20140625.001: Modify from '16' to 'VOICE_SIP_ACCT_MAX'.
#define VOICE_CONTROL_REQ_SIP_REGISTER_NO_ACTION 0
@@ -248,6 +249,8 @@
voiceCliType cliType;
char cmdLine[200];
#endif //ZYXEL_ZYIMS_CMD_TEST.
+
+ bool resetLineStats;
} voiceCtrlReq_t;
package/public-zyxel/libzcfg_msg/patches/066-BUGFIX_select_interrupt.patch
+169
View File
@@ -0,0 +1,169 @@
Index: libzcfg_msg-1.0/zcfg_msg.c
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.c 2016-01-07 12:32:37.074474736 +0800
+++ libzcfg_msg-1.0/zcfg_msg.c 2016-01-07 19:06:04.137718074 +0800
@@ -5,7 +5,8 @@
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
-
+#include <signal.h>
+#include <pthread.h>
#include "zcfg_msg.h"
#include "zcfg_debug.h"
@@ -95,6 +96,12 @@
struct sockaddr_un clientaddr;
zcfgMsg_t rcvMsg;
fd_set fdR;
+
+ sigset_t mask;
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGUSR1);
+ sigaddset(&mask, SIGUSR2);
+ sigaddset(&mask, SIGALRM);
if( myEid == -1 ){
zcfgLog(ZCFG_LOG_ERR, "Invalid eid. In %s\n", __FUNCTION__);
@@ -117,17 +124,18 @@
#if MSG_DEBUG
zcfgLog(ZCFG_LOG_DEBUG, "%s : Wait connection...\n", __FUNCTION__);
#endif
- result = select(myMsgfd+1, &fdR, NULL, NULL, tv);
+_retry:
+ result = pselect(myMsgfd+1, &fdR, NULL, NULL, tv, &mask);
/* check the select result */
- switch(result) {
- case 0:
- zcfgLog(ZCFG_LOG_WARNING, "Timeout\n");
- return ZCFG_TIMEOUT;
- case -1:
- perror("select:");
- return ZCFG_INTERNAL_ERROR;
- default:
- break;
+ if (result < 0 ){
+ perror("select:");
+// if(EINTR == errno) goto _retry;
+// else
+ return ZCFG_INTERNAL_ERROR;
+ }
+ else if(result == 0){
+ zcfgLog(ZCFG_LOG_WARNING, "Timeout\n");
+ return ZCFG_TIMEOUT;
}
if(FD_ISSET(myMsgfd, &fdR)) { //Is there a new connection coming?
@@ -214,7 +222,7 @@
sendSize = send(sendMsg->connFd, (char *)sendMsg, sizeof(zcfgMsg_t) + sendMsg->length, MSG_NOSIGNAL);
#else
clientaddr.sun_family = AF_UNIX;
- sprintf(clientaddr.sun_path, "%s%hhu-%d", ZCFG_ADDRESS_PREFIX, sendMsg->dstEid, sendMsg->clientPid);
+ sprintf(clientaddr.sun_path, "%s%hhu-%u", ZCFG_ADDRESS_PREFIX, sendMsg->dstEid, sendMsg->clientPid);
len = sizeof(clientaddr);
sendSize = sendto(myMsgfd, (char *)sendMsg, sizeof(zcfgMsg_t) + sendMsg->length, 0, (struct sockaddr*)&clientaddr, len);
#endif
@@ -236,6 +244,8 @@
* Description: Used by client to send a message to the server process and get a response.
*
*/
+static pthread_mutex_t __zcfg_msg_lock__=PTHREAD_MUTEX_INITIALIZER;
+static int32_t __zcfg_msg_req_idx__ = 0;
zcfgRet_t zcfgMsgSendAndGetReply(zcfgMsg_t *sendMsg, zcfgMsg_t **replyMsg, uint32_t timeout_msec)
{
int fd, rc;
@@ -247,13 +257,20 @@
fd_set readFds;
zcfgRet_t ret;
int flags;
+ sigset_t mask;
+ int32_t seqid;
+
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGUSR1);
+ sigaddset(&mask, SIGUSR2);
+ sigaddset(&mask, SIGALRM);
if( myEid == -1 ){
free(sendMsg);
zcfgLog(ZCFG_LOG_ERR, "Invalid eid\n");
return ZCFG_INVALID_EID;
}
-
+
memset(&rcvMsg, 0, sizeof(zcfgMsg_t));
if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0) {
@@ -261,14 +278,29 @@
free(sendMsg);
return ZCFG_INTERNAL_ERROR;
}
+
+ flags = 1;
+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags)) < 0){
+ perror("SO_REUSEADDR failed");
+ return ZCFG_INTERNAL_ERROR;
+ }
/*nonblocking operation*/
flags = fcntl(fd, F_GETFL, 0);
fcntl(fd, F_SETFL, flags | O_NONBLOCK);
clientaddr.sun_family = AF_UNIX;
+#if 1
+ seqid = getpid();
+ pthread_mutex_lock(&__zcfg_msg_lock__);
+ __zcfg_msg_req_idx__ = ((__zcfg_msg_req_idx__) % 0xFFFF)+1;
+
+ seqid |= (__zcfg_msg_req_idx__ << 16);
+ pthread_mutex_unlock(&__zcfg_msg_lock__);
+ sprintf(clientaddr.sun_path, "%s%d-%u", ZCFG_ADDRESS_PREFIX, myEid, seqid);
+#else
sprintf(clientaddr.sun_path, "%s%d-%d", ZCFG_ADDRESS_PREFIX, myEid, getpid());
-
+#endif
len = sizeof(clientaddr);
if (bind(fd, (struct sockaddr*)&clientaddr, len) < 0) {
@@ -277,7 +309,7 @@
close(fd);
unlink(clientaddr.sun_path);
free(sendMsg);
- return -1;
+ return ZCFG_INTERNAL_ERROR;
}
chmod(clientaddr.sun_path, 0777);
@@ -315,10 +347,16 @@
tmpTv.tv_usec = timeout_msec*1000;
tv = &tmpTv;
}
-
+
/* starting timer and wait data available */
- rc = select(fd+1, &readFds, NULL, NULL, tv);
- if ((rc == 1) && (FD_ISSET(fd, &readFds))) {
+ rc = pselect(fd+1, &readFds, NULL, NULL, tv, &mask);
+ if (rc < 0){
+ perror("select:");
+// if(EINTR == errno) goto _retry;
+// else
+ ret = ZCFG_INTERNAL_ERROR;
+ }
+ else if ((rc == 1) && (FD_ISSET(fd, &readFds))) {
/* receive message header first */
rcvSize = recvfrom(fd, (char *)(&rcvMsg), sizeof(zcfgMsg_t), MSG_PEEK, (struct sockaddr*)&serveraddr, &len);
if(rcvSize != sizeof(zcfgMsg_t)){
Index: libzcfg_msg-1.0/Makefile
===================================================================
--- libzcfg_msg-1.0.orig/Makefile 2016-01-07 12:32:37.174475235 +0800
+++ libzcfg_msg-1.0/Makefile 2016-01-07 15:45:21.385556024 +0800
@@ -5,7 +5,7 @@
all: clean libzcfg_msg
libzcfg_msg : zcfg_msg.o
- $(CC) -shared -o libzcfg_msg.so zcfg_msg.o
+ $(CC) -shared -o libzcfg_msg.so zcfg_msg.o -lpthread
zcfg_msg.o : zcfg_msg.c
$(CC) -c -fPIC zcfg_msg.c -Wall -I$(TOOLCHAIN)/include -I. -std=gnu99
package/public-zyxel/libzcfg_msg/patches/067-BUGFIX_ZYXEL_fix_Makefile.patch
+29
View File
@@ -0,0 +1,29 @@
Index: libzcfg_msg-1.0/Makefile
===================================================================
--- libzcfg_msg-1.0.orig/Makefile
+++ libzcfg_msg-1.0/Makefile
@@ -1,14 +1,20 @@
+OBJS = zcfg_msg.o
CURRENT_DIR = $(shell pwd)
+LINK_LIB = -lpthread
+LIBS_PATH =
+
+LDFLAGS += $(LIBS_PATH) $(LINK_LIB)
+CFLAGS += -I$(TOOLCHAIN)/include -I. -std=gnu99
.PHONY : libzcfg_msg
all: clean libzcfg_msg
-libzcfg_msg : zcfg_msg.o
- $(CC) -shared -o libzcfg_msg.so zcfg_msg.o -lpthread
+.c.o:
+ $(CC) $(CFLAGS) -Wall -fPIC -c $< -o $@
-zcfg_msg.o : zcfg_msg.c
- $(CC) -c -fPIC zcfg_msg.c -Wall -I$(TOOLCHAIN)/include -I. -std=gnu99
+libzcfg_msg : $(OBJS)
+ $(CC) $(LDFLAGS) -shared -o libzcfg_msg.so $(OBJS)
clean:
rm -rf *.o
package/public-zyxel/libzcfg_msg/patches/068-BUGFIX_memory_corruption.patch
+39
View File
@@ -0,0 +1,39 @@
Index: libzcfg_msg-1.0/zcfg_msg.c
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.c
+++ libzcfg_msg-1.0/zcfg_msg.c
@@ -154,7 +154,7 @@ _retry:
}
/* malloc recv buf size according to length field in msg header */
- if((*recvBuf = (zcfgMsg_t *)malloc(sizeof(zcfgMsg_t)+rcvMsg.length)) == NULL){
+ if((*recvBuf = (zcfgMsg_t *)calloc(sizeof(zcfgMsg_t)+rcvMsg.length+1, 1)) == NULL){
zcfgLog(ZCFG_LOG_ERR, "fail to allocate receive buffer. In %s\n", __FUNCTION__);
//close(new_fd);
//close(myMsgfd);
@@ -162,7 +162,7 @@ _retry:
}
/* copy header to recv buf */
- memset((void *)(*recvBuf), 0, sizeof(zcfgMsg_t)+rcvMsg.length);
+ //memset((void *)(*recvBuf), 0, sizeof(zcfgMsg_t)+rcvMsg.length);
//memcpy(*recvBuf, &rcvMsg, sizeof(zcfgMsg_t));
//buf = *recvBuf + 1;
#if 0
@@ -367,14 +367,14 @@ zcfgRet_t zcfgMsgSendAndGetReply(zcfgMsg
}
/* malloc recv buf size according to length field in msg header */
- if((*replyMsg = (zcfgMsg_t *)malloc(sizeof(zcfgMsg_t)+rcvMsg.length)) == NULL){
+ if((*replyMsg = (zcfgMsg_t *)calloc(sizeof(zcfgMsg_t)+rcvMsg.length+1, 1)) == NULL){
zcfgLog(ZCFG_LOG_ERR, "fail to allocate receive buffer. In %s\n", __FUNCTION__);
close(fd);
unlink(clientaddr.sun_path);
return ZCFG_INTERNAL_ERROR;
}
- memset((void *)(*replyMsg), 0, sizeof(zcfgMsg_t)+rcvMsg.length);
+ //memset((void *)(*replyMsg), 0, sizeof(zcfgMsg_t)+rcvMsg.length);
rcvSize = recvfrom(fd, (char *)(*replyMsg), sizeof(zcfgMsg_t)+rcvMsg.length, 0, (struct sockaddr*)&serveraddr, &len);
if(rcvSize != (sizeof(zcfgMsg_t)+rcvMsg.length)){
package/public-zyxel/libzcfg_msg/patches/069-ENHANCE_ZYXEL_RMA_FW_SUPPORT.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-01-25 17:38:39.725007594 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-01-25 17:42:21.586231598 +0800
@@ -162,6 +162,8 @@
#define ZCFG_MSG_WLAN_GET_CMD 520
#define ZCFG_MSG_WLAN_SET_CMD 521
+#define ZCFG_MSG_FAKEROOT_COMMAND (800 | ZCFG_NO_WAIT_REPLY)
+
#if 1 /* __ZyXEL__, Albert, 20150416, Web redirect */
#define ZCFG_MSG_WIFI_WEB_REDIRECT_CHECK (61 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_PPP_AUTH_FAIL (62 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/070-ENHANCE_ZYXEL_atsh_permission.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-02-24 15:21:36.519973217 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-02-24 15:28:16.901520125 +0800
@@ -163,6 +163,7 @@
#define ZCFG_MSG_WLAN_SET_CMD 521
#define ZCFG_MSG_FAKEROOT_COMMAND (800 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_FAKEROOT_SYS_ATSH 801 /* Fakeroot for "sys atsh" */
#if 1 /* __ZyXEL__, Albert, 20150416, Web redirect */
#define ZCFG_MSG_WIFI_WEB_REDIRECT_CHECK (61 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/071-ZYXEL_BUGFIX_sendMsg_leak.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.c
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.c 2016-03-21 19:08:56.091045084 +0800
+++ libzcfg_msg-1.0/zcfg_msg.c 2016-03-21 19:10:08.374694179 +0800
@@ -282,6 +282,7 @@
flags = 1;
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags)) < 0){
perror("SO_REUSEADDR failed");
+ free(sendMsg);
return ZCFG_INTERNAL_ERROR;
}
package/public-zyxel/libzcfg_msg/patches/072-ZYXEL_ENHANCE_wlan_reload_delay_MarkHsiao.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h
+++ libzcfg_msg-1.0/zcfg_msg.h
@@ -161,6 +161,7 @@
#define ZCFG_MSG_WPS_UPDATE_CONFIG 516
#define ZCFG_MSG_WLAN_GET_CMD 520
#define ZCFG_MSG_WLAN_SET_CMD 521
+#define ZCFG_MSG_WIFI_RELOAD_DELAY (522 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_FAKEROOT_COMMAND (800 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_FAKEROOT_SYS_ATSH 801 /* Fakeroot for "sys atsh" */
package/public-zyxel/libzcfg_msg/patches/073-ZYXEL-FEATURE_Release_Renew_IP_and_Connect_Disconnect_PPP_by_Status_page_shuying.patch
+17
View File
@@ -0,0 +1,17 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-04-28 16:54:46.933444081 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-04-28 16:55:31.961445721 +0800
@@ -66,6 +66,12 @@
/* __ZyXEL__, Albert, 20150622, Support DHCP option125 */
#define ZCFG_MSG_DHCP_OPTIONI125_CHK 49
#define ZCFG_MSG_VOICE_CAP_GET 50
+/* Connect/Disconnect PPP by Status page */
+#define ZCFG_MSG_WAN_PPP_DISCONNECT 51
+#define ZCFG_MSG_WAN_PPP_CONNECT 52
+/* Release/Renew IP by Status page */
+#define ZCFG_MSG_WAN_IP_RELEASE 53
+#define ZCFG_MSG_WAN_IP_RENEW 54
package/public-zyxel/libzcfg_msg/patches/074-ZYXEL_ENHANCE_support_reboot_sync_flash_event_type_MarkHsiao.patch
+14
View File
@@ -0,0 +1,14 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h
+++ libzcfg_msg-1.0/zcfg_msg.h
@@ -179,6 +179,9 @@
#define ZCFG_MSG_UPDATE_ONE_CONNECT (63 | ZCFG_NO_WAIT_REPLY)
/* end ZCFG message type */
+#define ZCFG_MSG_REQ_REBOOT (64 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_REQ_SYNCFLASH (65 | ZCFG_NO_WAIT_REPLY)
+
#define ZCFG_ADDRESS_PREFIX "/var/lib/.sock/zcfg_sockaddr"
#define ZCFG_MSG_BACKLOG 5
package/public-zyxel/libzcfg_msg/patches/075-ENHANCE_add_non_block_romd_event_YuruLi.patch
+14
View File
@@ -0,0 +1,14 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-05-10 18:05:17.742801495 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-05-10 18:06:49.569651600 +0800
@@ -145,6 +145,9 @@
#define ZCFG_MSG_AUTO_RSV_IP (56 | ZCFG_NO_WAIT_REPLY)//ch_wang
#define ZCFG_MSG_UPLOAD_DIAG_COMPLETE_EVENT (58 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_DHCPD_OPTION (59 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_CLEAN_ROMD_NO_REPLY (60 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_SAVE_ROMD_NO_REPLY (61 | ZCFG_NO_WAIT_REPLY)
+
/* WIFI message */
package/public-zyxel/libzcfg_msg/patches/076-ZYXEL_BUGFIX_change_pselect_to_select_MarkHsiao.patch
+59
View File
@@ -0,0 +1,59 @@
Index: libzcfg_msg-1.0/zcfg_msg.c
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.c
+++ libzcfg_msg-1.0/zcfg_msg.c
@@ -96,13 +96,13 @@ zcfgRet_t zcfgMsgReqRecv(zcfgMsg_t **rec
struct sockaddr_un clientaddr;
zcfgMsg_t rcvMsg;
fd_set fdR;
-
+#if 0
sigset_t mask;
sigemptyset(&mask);
sigaddset(&mask, SIGUSR1);
sigaddset(&mask, SIGUSR2);
sigaddset(&mask, SIGALRM);
-
+#endif
if( myEid == -1 ){
zcfgLog(ZCFG_LOG_ERR, "Invalid eid. In %s\n", __FUNCTION__);
return ZCFG_INVALID_EID;
@@ -125,7 +125,11 @@ zcfgRet_t zcfgMsgReqRecv(zcfgMsg_t **rec
zcfgLog(ZCFG_LOG_DEBUG, "%s : Wait connection...\n", __FUNCTION__);
#endif
_retry:
+#if 0
result = pselect(myMsgfd+1, &fdR, NULL, NULL, tv, &mask);
+#else
+ result = select(myMsgfd+1, &fdR, NULL, NULL, tv);
+#endif
/* check the select result */
if (result < 0 ){
perror("select:");
@@ -259,12 +263,12 @@ zcfgRet_t zcfgMsgSendAndGetReply(zcfgMsg
int flags;
sigset_t mask;
int32_t seqid;
-
+#if 0
sigemptyset(&mask);
sigaddset(&mask, SIGUSR1);
sigaddset(&mask, SIGUSR2);
sigaddset(&mask, SIGALRM);
-
+#endif
if( myEid == -1 ){
free(sendMsg);
zcfgLog(ZCFG_LOG_ERR, "Invalid eid\n");
@@ -350,7 +354,11 @@ zcfgRet_t zcfgMsgSendAndGetReply(zcfgMsg
}
/* starting timer and wait data available */
+#if 0
rc = pselect(fd+1, &readFds, NULL, NULL, tv, &mask);
+#else
+ rc = select(fd+1, &readFds, NULL, NULL, tv);
+#endif
if (rc < 0){
perror("select:");
// if(EINTR == errno) goto _retry;
package/public-zyxel/libzcfg_msg/patches/077-ZYXEL_BUGFIX_ReAdd_WAN_release_renew_command_AlbertLee.patch
+17
View File
@@ -0,0 +1,17 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-06-29 11:16:07.412915000 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-06-29 11:16:36.875638993 +0800
@@ -147,8 +147,10 @@
#define ZCFG_MSG_DHCPD_OPTION (59 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_CLEAN_ROMD_NO_REPLY (60 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_SAVE_ROMD_NO_REPLY (61 | ZCFG_NO_WAIT_REPLY)
-
-
+#if 1 //ZyXEL, Renew add WAN release/renew command, Albert
+#define ZCFG_MSG_WAN_PPP_DISCONNECTED (62 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_PPP_CONNECTING (63 | ZCFG_NO_WAIT_REPLY)
+#endif
/* WIFI message */
#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/077-ZYXEL_ENHANCE_add_msg_request_firmware_write_only_EricTsai.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-06-08 10:45:29.762358765 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-06-08 10:49:08.838362967 +0800
@@ -72,7 +72,7 @@
/* Release/Renew IP by Status page */
#define ZCFG_MSG_WAN_IP_RELEASE 53
#define ZCFG_MSG_WAN_IP_RENEW 54
-
+#define REQUEST_FIRMWARE_WRITE_ONLY 55
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
package/public-zyxel/libzcfg_msg/patches/078-ENHANCE_Support_partial_object_set_YuruLi.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-06-27 10:10:15.525808058 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-06-27 10:10:30.603122308 +0800
@@ -13,6 +13,7 @@
#if 1 /* non-blocking config apply, ZyXEL, John */
#define ZCFG_BLOCK_MODE_CONFIG_APPLY (1 << 30)
#endif
+#define ZCFG_PARTIAL_OBJECT_SET (1 << 29)
/* ZCFG message type with waiting reply*/
#define REQUEST_GET_NEXT_OBJ 0
package/public-zyxel/libzcfg_msg/patches/079-ZYXEL_BUGFIX_ReAdd_WAN_release_renew_command_AlbertLee.patch
+15
View File
@@ -0,0 +1,15 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-06-29 14:20:36.272578999 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-06-29 14:21:18.257561000 +0800
@@ -149,8 +149,8 @@
#define ZCFG_MSG_CLEAN_ROMD_NO_REPLY (60 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_SAVE_ROMD_NO_REPLY (61 | ZCFG_NO_WAIT_REPLY)
#if 1 //ZyXEL, Renew add WAN release/renew command, Albert
-#define ZCFG_MSG_WAN_PPP_DISCONNECTED (62 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WAN_PPP_CONNECTING (63 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_PPP_DISCONNECTED (66 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_PPP_CONNECTING (67 | ZCFG_NO_WAIT_REPLY)
#endif
/* WIFI message */
package/public-zyxel/libzcfg_msg/patches/080-ZYXEL_ENHANCE_add_delay_delete_msg_EricTsai.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-06-30 10:09:50.018779651 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-06-30 10:15:53.394786621 +0800
@@ -89,6 +89,8 @@
#define ZCFG_MSG_ADD_TR98_MAPPING 106
#define ZCFG_MSG_UPDATE_PARAMETER_NOTIFY (120 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_REQUEST_DELAY_DELETE 130
+
/* ZCFG message type without waiting reply*/
#define ZCFG_MSG_LAN_IP_CONNECTION_UP (1 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_DHCPC_BOUND (2 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/081-ZYXEL_BUGFIX_add_connction_lost_msg_chengtu.patch
Executable
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-07-13 20:35:21.763111808 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-07-13 20:36:50.239109100 +0800
@@ -60,6 +60,7 @@
#define ZCFG_MSG_MAIL_SEND_EVENT 42
#define REQUEST_RESTORE_DEFAULT_CHK 43
#define ZCFG_MSG_WAN_CONNCTION_READY 44
+#define ZCFG_MSG_WAN_CONNCTION_LOST 45
#if 1 /* __ZyXEL__, Albert, 20150520, Supports PPPoE Connection Delay and LCP Echo */
#define ZCFG_MSG_PPP_LCP_ECHO_GET 46
package/public-zyxel/libzcfg_msg/patches/082-ZYXEL_ENHANCE_add_hosts_msg_EricTsai.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-07-29 19:53:55.679515366 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-07-29 19:48:23.828616400 +0800
@@ -89,6 +89,7 @@
#define ZCFG_MSG_NOTIFY_TR69_TR98 (105 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_ADD_TR98_MAPPING 106
#define ZCFG_MSG_UPDATE_PARAMETER_NOTIFY (120 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_HOSTS 121
#define ZCFG_MSG_REQUEST_DELAY_DELETE 130
package/public-zyxel/libzcfg_msg/patches/083-ZYXEL_ENHANCE_Customization_vmg8924_windItaly_voip_boundIntf_priority_Raghu.patch
+14
View File
@@ -0,0 +1,14 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-10-27 14:11:23.103134674 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-10-27 14:12:14.460612446 +0800
@@ -150,6 +150,9 @@
#define ZCFG_MSG_AUTO_RSV_IP (56 | ZCFG_NO_WAIT_REPLY)//ch_wang
#define ZCFG_MSG_UPLOAD_DIAG_COMPLETE_EVENT (58 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_DHCPD_OPTION (59 | ZCFG_NO_WAIT_REPLY)
+#ifdef ZYXEL_WIND_ITALY_CUSTOMIZATION
+#define ZCFG_MSG_SIP_WAN_CHK (60 | ZCFG_NO_WAIT_REPLY)
+#endif
#define ZCFG_MSG_CLEAN_ROMD_NO_REPLY (60 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_SAVE_ROMD_NO_REPLY (61 | ZCFG_NO_WAIT_REPLY)
#if 1 //ZyXEL, Renew add WAN release/renew command, Albert
package/public-zyxel/libzcfg_msg/patches/084-ZYXEL_EHANCE_New_Internet_LED_Control_CjLai.patch
+12
View File
@@ -0,0 +1,12 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-11-01 09:53:17.297816855 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-11-01 09:54:25.019647100 +0800
@@ -159,6 +159,7 @@
#define ZCFG_MSG_WAN_PPP_DISCONNECTED (66 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_WAN_PPP_CONNECTING (67 | ZCFG_NO_WAIT_REPLY)
#endif
+#define ZCFG_MSG_WNA_INTERNET_LED_UPDATE (68 | ZCFG_NO_WAIT_REPLY)
/* WIFI message */
#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/085-ENHANCE-Support_whole_object_get_set_YuruLi.patch
+14
View File
@@ -0,0 +1,14 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-11-08 14:50:51.337491177 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-11-08 14:51:01.092566570 +0800
@@ -75,7 +75,8 @@
#define ZCFG_MSG_WAN_IP_RELEASE 53
#define ZCFG_MSG_WAN_IP_RENEW 54
#define REQUEST_FIRMWARE_WRITE_ONLY 55
-
+#define REQUEST_GET_WHOLE_OBJ_BY_NAME 56
+#define REQUEST_SET_WHOLE_OBJ_BY_NAME 57
#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
package/public-zyxel/libzcfg_msg/patches/086-ZYXEL_ENHANCE_sys_fwidcheck_Check_FWID_When_Doing_FW_upgrade.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-11-21 16:53:36.455132287 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-11-21 16:54:14.971286400 +0800
@@ -161,6 +161,8 @@
#define ZCFG_MSG_WAN_PPP_CONNECTING (67 | ZCFG_NO_WAIT_REPLY)
#endif
#define ZCFG_MSG_WNA_INTERNET_LED_UPDATE (68 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_ON (69 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_OFF (70 | ZCFG_NO_WAIT_REPLY)
/* WIFI message */
#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/087-ZYXEL_ENHANCE_command_fwidcheck_modelcheck_When_Doing_FW_upgrade_CjLai.patch
+24
View File
@@ -0,0 +1,24 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-11-29 14:29:26.986331413 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-11-29 14:30:57.605333000 +0800
@@ -95,6 +95,9 @@
#define ZCFG_MSG_REQUEST_DELAY_DELETE 130
+#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_STATUS 131
+#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_STATUS 132
+
/* ZCFG message type without waiting reply*/
#define ZCFG_MSG_LAN_IP_CONNECTION_UP (1 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_DHCPC_BOUND (2 | ZCFG_NO_WAIT_REPLY)
@@ -163,6 +166,9 @@
#define ZCFG_MSG_WNA_INTERNET_LED_UPDATE (68 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_ON (69 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_OFF (70 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_ON (71 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_OFF (72 | ZCFG_NO_WAIT_REPLY)
+
/* WIFI message */
#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/088-ZYXEL_FEATURE_support_proximity_sensor_BellChi.patch
+30
View File
@@ -0,0 +1,30 @@
Index: libzcfg_msg-1.0/Makefile
===================================================================
--- libzcfg_msg-1.0.orig/Makefile 2016-12-27 18:43:20.931864280 +0800
+++ libzcfg_msg-1.0/Makefile 2016-12-27 18:43:21.171864272 +0800
@@ -6,6 +6,10 @@
LDFLAGS += $(LIBS_PATH) $(LINK_LIB)
CFLAGS += -I$(TOOLCHAIN)/include -I. -std=gnu99
+ifeq ($(CONFIG_PROXIMITY_SENSOR_SUPPORT),y)
+CFLAGS += -DSUPPORT_PROXIMITY_SENSOR
+endif
+
.PHONY : libzcfg_msg
all: clean libzcfg_msg
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2016-12-27 18:43:21.163864272 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2016-12-27 18:43:45.211863449 +0800
@@ -168,6 +168,10 @@
#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_OFF (70 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_ON (71 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_OFF (72 | ZCFG_NO_WAIT_REPLY)
+#ifdef SUPPORT_PROXIMITY_SENSOR
+#define ZCFG_MSG_PROXIMITY_SENSOR_ON (73 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PROXIMITY_SENSOR_OFF (74 | ZCFG_NO_WAIT_REPLY)
+#endif
/* WIFI message */
package/public-zyxel/libzcfg_msg/patches/089-ZYXEL_ENHANCE_add_query_parm_attr_list_EricTsai.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-03-10 15:42:06.897035307 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-03-10 15:44:52.677036679 +0800
@@ -98,6 +98,8 @@
#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_STATUS 131
#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_STATUS 132
+#define ZCFG_MSG_REQUEST_GET_PARAM_ATTR_LIST 133
+
/* ZCFG message type without waiting reply*/
#define ZCFG_MSG_LAN_IP_CONNECTION_UP (1 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_DHCPC_BOUND (2 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/090-ZYXEL_FEATURE_MAC_filter_for_SONiQ_CPWang.patch
+15
View File
@@ -0,0 +1,15 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-04-26 16:01:01.427338995 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-04-26 16:01:44.809531900 +0800
@@ -198,6 +198,10 @@
#define ZCFG_MSG_WLAN_SET_CMD 521
#define ZCFG_MSG_WIFI_RELOAD_DELAY (522 | ZCFG_NO_WAIT_REPLY)
+#if 1 /* #36467, MAC filter with SONiQ, cpwang, 2017-04-18 10:56:46 */
+#define ZCFG_MSG_BSA_STA_FILTER (523 | ZCFG_NO_WAIT_REPLY)
+#endif /* #36467, MAC filter with SONiQ, cpwang, 2017-04-18 10:56:46 */
+
#define ZCFG_MSG_FAKEROOT_COMMAND (800 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_FAKEROOT_SYS_ATSH 801 /* Fakeroot for "sys atsh" */
package/public-zyxel/libzcfg_msg/patches/091-ZYXEL_ENHANCE_support_zyAutoProvision_MilesLin.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-05-06 14:29:23.597032319 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-05-06 14:35:54.833032926 +0800
@@ -174,7 +174,7 @@
#define ZCFG_MSG_PROXIMITY_SENSOR_ON (73 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_PROXIMITY_SENSOR_OFF (74 | ZCFG_NO_WAIT_REPLY)
#endif
-
+#define ZCFG_MSG_ZYAUTOPROVISION (75 | ZCFG_NO_WAIT_REPLY)//Miles_Lin
/* WIFI message */
#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/092-ZYXEL_ENHANCE_power_management_control_event_LindaHuang.patch
+31
View File
@@ -0,0 +1,31 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-05-08 14:09:35.438585955 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-05-09 13:54:09.973868420 +0800
@@ -175,6 +175,11 @@
#define ZCFG_MSG_PROXIMITY_SENSOR_OFF (74 | ZCFG_NO_WAIT_REPLY)
#endif
#define ZCFG_MSG_ZYAUTOPROVISION (75 | ZCFG_NO_WAIT_REPLY)//Miles_Lin
+#ifdef ZYXEL_POWER_MGMT
+#define ZCFG_MSG_POWER_MGMT_LED_ON (76 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_POWER_MGMT_LED_OFF (77 | ZCFG_NO_WAIT_REPLY)
+#endif
+
/* WIFI message */
#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
Index: libzcfg_msg-1.0/Makefile
===================================================================
--- libzcfg_msg-1.0.orig/Makefile 2017-05-08 14:09:35.410585955 +0800
+++ libzcfg_msg-1.0/Makefile 2017-05-09 11:38:01.517087611 +0800
@@ -10,6 +10,10 @@
CFLAGS += -DSUPPORT_PROXIMITY_SENSOR
endif
+ifeq ($(CONFIG_ZYXEL_POWER_MANAGEMENT),y)
+CFLAGS += -DZYXEL_POWER_MGMT
+endif
+
.PHONY : libzcfg_msg
all: clean libzcfg_msg
package/public-zyxel/libzcfg_msg/patches/093-ZYXEL_ENHANCE_add_SONiQ_message_type_RonChen.patch
Executable
+30
View File
@@ -0,0 +1,30 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-06-01 12:47:59.818690209 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-06-01 14:53:26.377120948 +0800
@@ -199,6 +199,9 @@
#if 1 /* #36467, MAC filter with SONiQ, cpwang, 2017-04-18 10:56:46 */
#define ZCFG_MSG_BSA_STA_FILTER (523 | ZCFG_NO_WAIT_REPLY)
#endif /* #36467, MAC filter with SONiQ, cpwang, 2017-04-18 10:56:46 */
+#ifdef BUILD_SONIQ
+#define ZCFG_MSG_ENABLE_SONiQ (524 | ZCFG_NO_WAIT_REPLY)
+#endif
#define ZCFG_MSG_FAKEROOT_COMMAND (800 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_FAKEROOT_SYS_ATSH 801 /* Fakeroot for "sys atsh" */
Index: libzcfg_msg-1.0/Makefile
===================================================================
--- libzcfg_msg-1.0.orig/Makefile 2017-06-01 12:47:59.778690209 +0800
+++ libzcfg_msg-1.0/Makefile 2017-06-01 12:48:30.711009424 +0800
@@ -10,6 +10,11 @@
CFLAGS += -DSUPPORT_PROXIMITY_SENSOR
endif
+#SONiQ Steering
+ifeq ($(CONFIG_ZYXEL_SONIQ),y)
+CFLAGS += -DBUILD_SONIQ
+endif
+
.PHONY : libzcfg_msg
all: clean libzcfg_msg
package/public-zyxel/libzcfg_msg/patches/094-ZYXEL_ENHANCE_switch_boot_image_TimLiu.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-06-09 17:05:58.458258731 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-06-12 15:07:23.874394685 +0800
@@ -179,6 +179,8 @@
#define ZCFG_MSG_POWER_MGMT_LED_ON (76 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_POWER_MGMT_LED_OFF (77 | ZCFG_NO_WAIT_REPLY)
#endif
+//Zyxel, TimLiu, need to wait the swap process complete!
+#define ZCFG_MSG_REQ_SWITCH_BOOT_PARTITION 78
/* WIFI message */
package/public-zyxel/libzcfg_msg/patches/095-ZYXEL-ENHANCE_Support_Account_resetDefault_by_UserinterfacePasswordReset_CjLai.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-06-14 15:02:21.965646349 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-06-14 15:03:51.245368100 +0800
@@ -182,6 +182,8 @@
//Zyxel, TimLiu, need to wait the swap process complete!
#define ZCFG_MSG_REQ_SWITCH_BOOT_PARTITION 78
+//Zyxel, CjLai
+#define ZCFG_MSG_RESET_ACCOUNT_DEFAULT (79 | ZCFG_NO_WAIT_REPLY)
/* WIFI message */
#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/096-ZYXEL_ENHANCE_add_PresetSSID_and_AutoCfg_message_LindaHuang.patch
+15
View File
@@ -0,0 +1,15 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-06-27 14:42:48.840830359 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-06-27 14:43:14.628670995 +0800
@@ -212,6 +212,10 @@
#endif /* #36467, MAC filter with SONiQ, cpwang, 2017-04-18 10:56:46 */
#ifdef BUILD_SONIQ
#define ZCFG_MSG_ENABLE_SONiQ (524 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PRESET_SSID_EN (525 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_GET_LINK_RATE 526
+#define ZCFG_MSG_CFG_DISTRIBUTE (527 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_CFG_GET_DIST_STATUS 528
#endif
#define ZCFG_MSG_FAKEROOT_COMMAND (800 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/097-ZYXEL_ENHANCE_Error_handling_while_adding_extenders_DerekYu.patch
+22
View File
@@ -0,0 +1,22 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-07-25 11:16:36.784950840 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-07-25 11:18:50.517049193 +0800
@@ -200,11 +200,12 @@
#define ZCFG_MSG_BSA_STA_FILTER (523 | ZCFG_NO_WAIT_REPLY)
#endif /* #36467, MAC filter with SONiQ, cpwang, 2017-04-18 10:56:46 */
#ifdef BUILD_SONIQ
-#define ZCFG_MSG_ENABLE_SONiQ (524 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PRESET_SSID_EN (525 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_GET_LINK_RATE 526
-#define ZCFG_MSG_CFG_DISTRIBUTE (527 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_CFG_GET_DIST_STATUS 528
+#define ZCFG_MSG_ENABLE_SONiQ (524 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PRESET_SSID_EN (525 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_GET_LINK_RATE 526
+#define ZCFG_MSG_CFG_DISTRIBUTE (527 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_CFG_GET_DIST_STATUS 528
+#define ZCFG_MSG_PRESET_SSID_DIS (529 | ZCFG_NO_WAIT_REPLY)
#endif
#define ZCFG_MSG_FAKEROOT_COMMAND (800 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_FAKEROOT_SYS_ATSH 801 /* Fakeroot for "sys atsh" */
package/public-zyxel/libzcfg_msg/patches/098-ZYXEL_ENHANCE_add_pingsvrs_msg_EricTsai.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-07-27 20:27:58.292557059 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-07-27 20:22:07.704426000 +0800
@@ -185,6 +185,8 @@
//Zyxel, CjLai
#define ZCFG_MSG_RESET_ACCOUNT_DEFAULT (79 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PINGSVRS_RST (80 | ZCFG_NO_WAIT_REPLY)
+
/* WIFI message */
#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_WIFI_RELOAD (501 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/100-ZYXEL_ENHANCE_add_query_obj_param_attr_msg_EricTsai.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-08-01 15:18:06.099978022 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-08-01 15:20:45.303979339 +0800
@@ -99,6 +99,8 @@
#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_STATUS 132
#define ZCFG_MSG_REQUEST_GET_PARAM_ATTR_LIST 133
+
+#define REQUEST_QUERY_OBJ_PARAM_ATTR 134
/* ZCFG message type without waiting reply*/
#define ZCFG_MSG_LAN_IP_CONNECTION_UP (1 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/102-ZYXEL_ENHANCE_add_query_obj_exist_msg_EricTsai.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-08-07 13:32:27.629979047 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-08-07 13:32:04.493978856 +0800
@@ -102,6 +102,8 @@
#define REQUEST_QUERY_OBJ_PARAM_ATTR 134
+#define REQUEST_QUERY_OBJ_EXIST 135
+
/* ZCFG message type without waiting reply*/
#define ZCFG_MSG_LAN_IP_CONNECTION_UP (1 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_DHCPC_BOUND (2 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/103-ZYXEL_ENHANCE_add_debug_config_msg_EricTsai.patch
+50
View File
@@ -0,0 +1,50 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-08-18 11:51:55.579941502 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-08-18 11:51:55.583941502 +0800
@@ -104,6 +104,8 @@
#define REQUEST_QUERY_OBJ_EXIST 135
+#define ZCFG_MSG_LOG_SETTING_CONFIG (136 | ZCFG_NO_WAIT_REPLY)
+
/* ZCFG message type without waiting reply*/
#define ZCFG_MSG_LAN_IP_CONNECTION_UP (1 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_DHCPC_BOUND (2 | ZCFG_NO_WAIT_REPLY)
Index: libzcfg_msg-1.0/zcfg_msg.c
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.c 2017-08-18 11:51:55.411941499 +0800
+++ libzcfg_msg-1.0/zcfg_msg.c 2017-08-18 11:51:55.583941502 +0800
@@ -8,12 +8,17 @@
#include <signal.h>
#include <pthread.h>
#include "zcfg_msg.h"
+#define ZCFG_MSG_DEBUGCFG
#include "zcfg_debug.h"
#define MSG_DEBUG 0
int myEid = -1;
int myMsgfd = -1;
+
+void *myDebugCfgObj = NULL;
+volatile unsigned int myDebugCfgObjLevel = 0;
+
/*
* Function Name: zcfgEidInit
* Description: Used by process to register its entity id.
Index: libzcfg_msg-1.0/Makefile
===================================================================
--- libzcfg_msg-1.0.orig/Makefile 2017-08-18 11:51:55.531941501 +0800
+++ libzcfg_msg-1.0/Makefile 2017-08-18 11:52:27.679942118 +0800
@@ -19,6 +19,10 @@
CFLAGS += -DBUILD_SONIQ
endif
+ifeq ($(CONFIG_ZCFG_LOG_USE_DEBUGCFG),y)
+CFLAGS += -DZCFG_LOG_USE_DEBUGCFG
+endif
+
.PHONY : libzcfg_msg
all: clean libzcfg_msg
package/public-zyxel/libzcfg_msg/patches/104-ENHANCE_VOICE_Extend_VoIP_Stats_DataStruct_to_support_VoIP_CLI_for_SIP_Register_and_MWI_Status_Diaplay_MichaelLin.patch
+27
View File
@@ -0,0 +1,27 @@
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2017-09-04 15:45:12.002185398 +0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2017-09-01 20:40:59.322367200 +0800
@@ -4,7 +4,8 @@
#include "zcfg_rdm_obj.h"
#define ZCFG_MSG_VOICE_REPLY_WAIT_TIMEOUT 2000 //ms
-#define VOICE_SIP_ACCT_MAX 16 //Michael.20140625.001: Add.
+#define VOICE_SIP_ACCT_MAX 16 //Michael.20140625.001: Add.
+#define VOICE_SIP_PROF_MAX 2 //Michael.20170831.001: Add. This value SHOULD refer to the $(X-ZyIMS)/core/common/core/h/switch.h/ZYXEL_SIP_PROFILE_NUM_MAX (2).
//Michael.20140625.001.B: Add.
@@ -99,6 +100,12 @@
uint16_t bitFlag;
uint16_t errorBitFlag; //2015-02-13 Steve Add. Use RSP bit to indicate error. if all success will be 0
+ //Michael.20170831.001.B: Add to Extend the VoIP Stats info-related Data Structure to support VoIP CLI for SIP Registration and MWI Status info Display/Dump.
+ uint8_t sipProfCnt;
+ uint8_t sipProfLineCnt[VOICE_SIP_PROF_MAX];
+ uint8_t sipAcctCnt;
+ //Michael.20170831.001.E: Add.
+
//NOTE: the following definitions SHOULD sync with those corresponding global variables in the 'vcm.c' of the ZyIMS VoIP's config system.
uint32_t registerStatusSet1; //bitmap: every successive 4bit (from the LSB) as a set, which can represent 10 statuses, is corresponding to one SIP account/line. This set can handle 8 SIP accounts/lines - SIP-00 ~ SIP-08.
uint32_t registerStatusSet2; //bitmap: every successive 4bit (from the LSB) as a set, which can represent 10 statuses, is corresponding to one SIP account/line. This set can handle 8 SIP accounts/lines - SIP-08 ~ SIP-15.
package/public-zyxel/libzcfg_msg/patches/105-BUGFIX_VOICE_Redmine41452_by_making_VoIP_support_SIP_Line_CallState_info_Retrieve_via_TR069_AmberXie.patch
+45
View File
@@ -0,0 +1,45 @@
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2017-09-05 13:45:32.474472436 +0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2017-09-05 13:54:00.382491138 +0800
@@ -68,7 +68,8 @@
#define VOICE_STATS_REQ_PHONE_HOOK_STATUS (1 << 3)
#define VOICE_STATS_REQ_VOIP_INUSE (1 << 4)
#define VOICE_STATS_REQ_ONGOING_CALL_CNT (1 << 5)
-#define VOICE_STATS_REQ_VOICE_LINE_STATS (1 << 6)
+#define VOICE_STATS_REQ_VOICE_LINE_STATS (1 << 6)
+#define VOICE_STATS_REQ_SIP_LINE_CALL_STATE (1 << 7) //Amber.20170901: Add for support SIP Line CallState info Retrieve via TR069
//======
typedef struct voiceStatsReq_s {
uint16_t bitFlag;
@@ -87,8 +88,9 @@
#define VOICE_STATS_RSP_CALL_STATE (1 << 3)
#define VOICE_STATS_RSP_PHONE_HOOK_STATUS (1 << 4)
#define VOICE_STATS_RSP_VOIP_INUSE (1 << 5)
-#define VOICE_STATS_RSP_ONGOING_CALL_CNT (1 << 6)
-#define VOICE_STATS_RSP_VOICE_LINE_STATS (1 << 7)
+#define VOICE_STATS_RSP_ONGOING_CALL_CNT (1 << 6)
+#define VOICE_STATS_RSP_VOICE_LINE_STATS (1 << 7)
+#define VOICE_STATS_RSP_SIP_LINE_CALL_STATE (1 << 8) //Amber.20170901: Add for support SIP Line CallState info Retrieve via TR069
//======
#define VOICE_STATS_RSP_REGISTRATION_STATUS_SET_SIZE 8
#define VOICE_STATS_RSP_REGISTRATION_STATUS_MASK 0x0f
@@ -111,10 +113,16 @@
uint32_t registerStatusSet2; //bitmap: every successive 4bit (from the LSB) as a set, which can represent 10 statuses, is corresponding to one SIP account/line. This set can handle 8 SIP accounts/lines - SIP-08 ~ SIP-15.
//------
uint16_t mwiStatus; //bitmap: each bit (from the LSB), which represents NoMWI=0 & IsMWI=1, is corresponding to one SIP account/line. This can handle 16 SIP accounts/lines - SIP-00 ~ SIP-15.
- uint32_t callState; //bitmap: every successive 3bit (from the LSB) as a set, which can represent 8 states, is corresponding to one Call. This can handle 10 Concurrent Calls - Call-00 ~ Call-09.
+ //------
+ //Amber.20170901: Modify for support SIP Line CallState info Retrieve via TR069.
+ //uint32_t callState; //bitmap: every successive 3bit (from the LSB) as a set, which can represent 8 states, is corresponding to one Call. This can handle 10 Concurrent Calls - Call-00 ~ Call-09.
+ char callState[128+1]; //consider a worst case: 8(call)*("Disconnecting") = 8*(13+1) = 112.
+ //------
uint32_t phoneHookState; //bitmap: each bit (from the LSB), which represents OnHooked=0 & OffHooked=1, is corresponding to one FXS phone port. This can handle 8 FXS phone ports - FXS-00 ~ FXS-07.
+ //------
//yushiuan add start , for to record the call status information, 2015/01/06
- char status[64+1];
+ //char status[64+1];
+ char status[128+1]; //Amber.20170901: consider a worst case: 8(call)*("Disconnecting") = 8*(13+1) = 112.
char callStartTime[128+1];
char selfNumber[512+1];
char peerNumber[512+1];
package/public-zyxel/libzcfg_msg/patches/106-BUGFIX_msg_retry_sendto_when_EAGAIN_or_EWOULDBLOCK_BellChi.patch
+131
View File
@@ -0,0 +1,131 @@
Index: libzcfg_msg-1.0/zcfg_msg.c
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.c 2017-09-08 15:10:11.676686552 +0800
+++ libzcfg_msg-1.0/zcfg_msg.c 2017-09-08 16:39:03.581655429 +0800
@@ -220,6 +220,7 @@
zcfgRet_t zcfgMsgRepSend(zcfgMsg_t *sendMsg)
{
int sendSize = 0, len = 0;
+ int errorNo = 0;
struct sockaddr_un clientaddr;
if( myEid == -1 ){
@@ -227,20 +228,54 @@
free(sendMsg);
return ZCFG_INVALID_EID;
}
-#if 0
- sendSize = send(sendMsg->connFd, (char *)sendMsg, sizeof(zcfgMsg_t) + sendMsg->length, MSG_NOSIGNAL);
-#else
clientaddr.sun_family = AF_UNIX;
sprintf(clientaddr.sun_path, "%s%hhu-%u", ZCFG_ADDRESS_PREFIX, sendMsg->dstEid, sendMsg->clientPid);
len = sizeof(clientaddr);
+#if 0 /* BellChi, enhance sendto errno is EAGAIN or EWOULDBLOCK, 2017-09-08 14:36:30 */
sendSize = sendto(myMsgfd, (char *)sendMsg, sizeof(zcfgMsg_t) + sendMsg->length, 0, (struct sockaddr*)&clientaddr, len);
-#endif
if(sendSize != (sizeof(zcfgMsg_t) + sendMsg->length)){
zcfgLog(ZCFG_LOG_ERR, "%s : sendto %s fail. Error is %s\n", __FUNCTION__, clientaddr.sun_path, strerror(errno));
//close(sendMsg->connFd);
free(sendMsg);
return ZCFG_INTERNAL_ERROR;
}
+#else
+ while (1)
+ {
+ sendSize = sendto(myMsgfd, (char *)sendMsg, sizeof(zcfgMsg_t) + sendMsg->length, 0, (struct sockaddr*)&clientaddr, len);
+ errorNo = errno;
+ if (sendSize < 0)
+ {
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendto %s fail.\n", __FUNCTION__, __LINE__, clientaddr.sun_path);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendSize is %d\n", __FUNCTION__, __LINE__, sendSize);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : Error no is %d\n", __FUNCTION__, __LINE__, errno);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : Error msg is %s\n", __FUNCTION__, __LINE__, strerror(errno));
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendMsg->type is %d\n", __FUNCTION__, __LINE__, sendMsg->type);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendMsg->oid is %d\n", __FUNCTION__, __LINE__, sendMsg->oid);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendMsg->srcEid is %d\n", __FUNCTION__, __LINE__, sendMsg->srcEid);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendMsg->dstEid is %d\n", __FUNCTION__, __LINE__, sendMsg->dstEid);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendMsg->length is %d\n", __FUNCTION__, __LINE__, sendMsg->length);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sizeof(zcfgMsg_t) + sendMsg->length is %d\n", __FUNCTION__, __LINE__, sizeof(zcfgMsg_t) + sendMsg->length);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendMsg->clientPid is %d\n", __FUNCTION__, __LINE__, sendMsg->clientPid);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendMsg->statCode is %d\n", __FUNCTION__, __LINE__, sendMsg->statCode);
+
+ if (errorNo == EAGAIN || errorNo == EWOULDBLOCK)
+ {
+ sleep(1); //wait 1 seconds
+ continue;
+ }
+ }
+
+ if (sendSize != (sizeof(zcfgMsg_t) + sendMsg->length))
+ {
+ //close(sendMsg->connFd);
+ free(sendMsg);
+ return ZCFG_INTERNAL_ERROR;
+ }
+ break;
+ }
+
+#endif
#if MSG_DEBUG
zcfgLog(ZCFG_LOG_DEBUG, "message transmission success !!\n");
#endif
@@ -268,6 +303,7 @@
int flags;
sigset_t mask;
int32_t seqid;
+ int errorNo = 0;
#if 0
sigemptyset(&mask);
sigaddset(&mask, SIGUSR1);
@@ -329,6 +365,7 @@
msgHdr = (zcfgMsg_t*)sendMsg;
msgHdr->srcEid = myEid;
+#if 0 /* BellChi, enhance sendto errno is EAGAIN or EWOULDBLOCK, 2017-09-08 14:36:30 */
sendSize = sendto(fd, (char *)sendMsg, sizeof(zcfgMsg_t) + sendMsg->length, 0, (struct sockaddr*)&saun, len);
if(sendSize != (sizeof(zcfgMsg_t) + sendMsg->length)){
zcfgLog(ZCFG_LOG_ERR, "%s : sendto %s fail. Error is %s\n", __FUNCTION__, saun.sun_path, strerror(errno));
@@ -337,6 +374,43 @@
unlink(clientaddr.sun_path);
return ZCFG_INTERNAL_ERROR;
}
+#else
+ while (1)
+ {
+ sendSize = sendto(fd, (char *)sendMsg, sizeof(zcfgMsg_t) + sendMsg->length, 0, (struct sockaddr*)&saun, len);
+ errorNo = errno;
+ if (sendSize < 0)
+ {
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendto %s fail.\n", __FUNCTION__, __LINE__, saun.sun_path);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendSize is %d\n", __FUNCTION__, __LINE__, sendSize);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : Error no is %d\n", __FUNCTION__, __LINE__, errno);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : Error msg is %s\n", __FUNCTION__, __LINE__, strerror(errno));
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendMsg->type is %d\n", __FUNCTION__, __LINE__, sendMsg->type);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendMsg->oid is %d\n", __FUNCTION__, __LINE__, sendMsg->oid);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendMsg->srcEid is %d\n", __FUNCTION__, __LINE__, sendMsg->srcEid);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendMsg->dstEid is %d\n", __FUNCTION__, __LINE__, sendMsg->dstEid);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendMsg->length is %d\n", __FUNCTION__, __LINE__, sendMsg->length);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sizeof(zcfgMsg_t) + sendMsg->length is %d\n", __FUNCTION__, __LINE__, sizeof(zcfgMsg_t) + sendMsg->length);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendMsg->clientPid is %d\n", __FUNCTION__, __LINE__, sendMsg->clientPid);
+ zcfgLog(ZCFG_LOG_ERR, "%s:%d : sendMsg->statCode is %d\n", __FUNCTION__, __LINE__, sendMsg->statCode);
+
+ if (errorNo == EAGAIN || errorNo == EWOULDBLOCK)
+ {
+ sleep(1); //wait 1 seconds
+ continue;
+ }
+ }
+
+ if (sendSize != (sizeof(zcfgMsg_t) + sendMsg->length))
+ {
+ close(fd);
+ free(sendMsg);
+ unlink(clientaddr.sun_path);
+ return ZCFG_INTERNAL_ERROR;
+ }
+ break;
+ }
+#endif
/*Check whether it needs to wait reply message*/
if(sendMsg->type & ZCFG_NO_WAIT_REPLY) {
package/public-zyxel/libzcfg_msg/patches/108-ZYXEL_ENHANCE_add_query_obj_instance_array_EricTsai.patch
+13
View File
@@ -0,0 +1,13 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-09-13 11:08:25.266982803 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-09-13 11:10:54.810985672 +0800
@@ -106,6 +106,8 @@
#define ZCFG_MSG_LOG_SETTING_CONFIG (136 | ZCFG_NO_WAIT_REPLY)
+#define REQUEST_QUERY_TR98_OBJ_INSTANCE_ARRAY 140
+#define REQUEST_QUERY_TR181_OBJ_INSTANCE_ARRAY 141
/* ZCFG message type without waiting reply*/
#define ZCFG_MSG_LAN_IP_CONNECTION_UP (1 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_DHCPC_BOUND (2 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/109-ZYXEL_ENHANCE_zcfgMsg_handling_partial_send_and_receive_BellChi.patch
+1040
View File
File diff suppressed because it is too large Load Diff
package/public-zyxel/libzcfg_msg/patches/110-ZYXEL_ENHANCE_zcfg_msg_per_thread_BellChi.patch
Executable
+1112
View File
File diff suppressed because it is too large Load Diff
package/public-zyxel/libzcfg_msg/patches/111-ZYXEL_ENHANCE_add_debug_log_CPWang.patch
+63
View File
@@ -0,0 +1,63 @@
Index: libzcfg_msg-1.0/zcfg_msg.c
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.c 2017-10-24 19:54:53.935013220 +0800
+++ libzcfg_msg-1.0/zcfg_msg.c 2017-10-24 19:55:56.289687996 +0800
@@ -31,6 +31,7 @@
#define _MAX_THREADS 3
#define _DEBUG_MSG 0
+
#define _MSG_TYPE(_t_) (_t_ & (~ZCFG_NO_WAIT_REPLY))
#define _MSG_REPLY(_t_) (!(_t_ & ZCFG_NO_WAIT_REPLY))
@@ -275,6 +276,9 @@
if (b_server)
{
sscanf(clientaddr.sun_path, "%*[^-]-%u", &clientPid);
+#if _DEBUG_MSG
+ zcfg_msg_dbg_printf("DEBUG : recv from client PID = %u\n", clientPid);
+#endif
}
/* malloc recv buf size according to length field in msg header */
@@ -370,6 +374,10 @@
}
addr_len = sizeof(client_addr);
+#if _DEBUG_MSG
+ zcfg_msg_dbg_printf("DEBUG : client_addr.sun_path = %s\n", client_addr.sun_path);
+#endif
+
ptr = (char *)sendMsg;
total_len = sizeof(zcfgMsg_t) + sendMsg->length;
@@ -389,7 +397,7 @@
}
zcfg_msg_dbg_printf("ERROR : errno = %d, %s\n", errno, strerror(errno));
- zcfg_msg_dbg_printf("ERROR : fail to sendto(%s)\n", client_addr.sun_path);
+ zcfg_msg_dbg_printf("ERROR : fail to sendto %s\n", client_addr.sun_path);
zcfg_msg_dbg_printf("ERROR : srcEid = %d, dstEid = %d, type = %d, %s reply\n",
sendMsg->srcEid, sendMsg->dstEid, _MSG_TYPE(sendMsg->type), _MSG_REPLY(sendMsg->type) ? "with" : "without");
@@ -578,6 +586,8 @@
return ZCFG_INTERNAL_ERROR;
}
+ zcfg_msg_dbg_printf("INFO : EID %u bind server on %s successfully\n", my_entry->eid, saun.sun_path);
+
// allow access
chmod(saun.sun_path, 0777);
@@ -762,6 +772,11 @@
unlink(clientaddr.sun_path);
return ZCFG_INTERNAL_ERROR;
}
+
+#if _DEBUG_MSG
+ zcfg_msg_dbg_printf("DEBUG : EID %u bind server on %s successfully\n", eid, clientaddr.sun_path);
+#endif
+
chmod(clientaddr.sun_path, 0777);
/*
package/public-zyxel/libzcfg_msg/patches/112-ZYXEL_ENHANCE_add_debug_log_CPWang.patch
+469
View File
@@ -0,0 +1,469 @@
Index: libzcfg_msg-1.0/zcfg_msg.c
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.c 2017-10-25 13:01:30.425185999 +0800
+++ libzcfg_msg-1.0/zcfg_msg.c 2017-10-25 13:01:46.970109662 +0800
@@ -32,7 +32,7 @@
#define _DEBUG_MSG 0
-#define _MSG_TYPE(_t_) (_t_ & (~ZCFG_NO_WAIT_REPLY))
+#define _MSG_TYPE(_t_) (_t_ & 0x00FFffFF)
#define _MSG_REPLY(_t_) (!(_t_ & ZCFG_NO_WAIT_REPLY))
#define _MUTEX_LOCK() pthread_mutex_lock(&_mutex)
@@ -757,7 +757,7 @@
seqid = getpid();
_MUTEX_LOCK();
- _zcfg_msg_req_idx = ((_zcfg_msg_req_idx) % 0xFFFF)+1;
+ _zcfg_msg_req_idx = ((_zcfg_msg_req_idx) % 0xFFFF) + 1;
seqid |= (_zcfg_msg_req_idx << 16);
_MUTEX_UNLOCK();
@@ -796,6 +796,11 @@
{
close(fd);
unlink(clientaddr.sun_path);
+
+#if _DEBUG_MSG
+ zcfg_msg_dbg_printf("DEBUG : EID %u not need to wait for reply, close socket\n", eid);
+#endif
+
return ZCFG_SUCCESS_AND_NO_REPLY;
}
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-10-25 13:01:30.417182000 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-10-25 13:01:30.437191999 +0800
@@ -10,243 +10,243 @@
#include <sys/un.h>
#endif
-#define ERROR_APPLY_MSG -1
+#define ERROR_APPLY_MSG -1
-#define ZCFG_NO_WAIT_REPLY (1 << 31)
+#define ZCFG_NO_WAIT_REPLY (1 << 31)
#if 1 /* non-blocking config apply, ZyXEL, John */
-#define ZCFG_BLOCK_MODE_CONFIG_APPLY (1 << 30)
+#define ZCFG_BLOCK_MODE_CONFIG_APPLY (1 << 30)
#endif
-#define ZCFG_PARTIAL_OBJECT_SET (1 << 29)
+#define ZCFG_PARTIAL_OBJECT_SET (1 << 29)
/* ZCFG message type with waiting reply*/
-#define REQUEST_GET_NEXT_OBJ 0
-#define RESPONSE_NO_MORE_INSTANCE 1
-#define REQUEST_GET_OBJ 2
-#define RESPONSE_GET_SUCCESS 3
-#define RESPONSE_GET_EMPTY 4
-#define RESPONSE_GET_FAIL 5
-#define REQUEST_SET_OBJ 6
-#define REQUEST_SET_MULTI_OBJ 7
-#define REQUEST_ADD_INSTANCE 8
-#define REQUEST_DEL_INSTANCE 9
-#define REQUEST_FIRMWARE_UPGRADE 10
-#define REQUEST_RESTORE_DEFAULT 11
-#define RESPONSE_SUCCESS 12
-#define RESPONSE_FAIL 13
-#define REQUEST_GET_NEXT_SUB 14
-#define REQUEST_GET_PARAM_ATTR 15
-#define REQUEST_SET_PARAM_ATTR 16
-#define RESPONSE_WRITE_OBJ_SUCCESS 17
-#define RESPONSE_WRITE_OBJ_FAIL 18
-#define ZCFG_MSG_DELAY_APPLY 19
-#define ZCFG_MSG_RE_APPLY 20
-#define REQUEST_SET_WITHOUT_APPLY 21
-#define REQUEST_ROMD_UPGRADE 22
-#define REQUEST_GET_OBJ_WITHOUT_UPDATE 23
-#define REQUEST_CONFIG_BACKUP 24
-#define ZCFG_MSG_UPNP_PORTMAP_GET 25
-
-#define REQUEST_GET_NEXT_OBJ_WITHOUT_UPDATE 27
-#define REQUEST_GET_NEXT_SUB_WITHOUT_UPDATE 28
-#define ZCFG_MSG_VOICE_STATS_GET 29
-#define ZCFG_MSG_VOICE_CONTROL 30
-#define ZCFG_MSG_VOICE_DEBUG_AND_TEST 31
-#define REQUEST_REINIT_MACLESS_PROVISIONING 32
-#define ZCFG_MSG_DECT_CONTROL 33
-#define ZCFG_MSG_DECT_STATS_GET 34
-#define ZCFG_MSG_GET_TR98_ALL_IGD_NAMES 36
-#define ZCFG_MSG_MCPCTL 37
-#define ZCFG_MSG_CLEAN_ROMD 38
-#define ZCFG_MSG_SAVE_ROMD 39
-#define ZCFG_MSG_VOICE_LIST_ACCESS 40
-#define REQUEST_FIRMWARE_UPGRADE_CHK 41
-#define ZCFG_MSG_MAIL_SEND_EVENT 42
-#define REQUEST_RESTORE_DEFAULT_CHK 43
-#define ZCFG_MSG_WAN_CONNCTION_READY 44
-#define ZCFG_MSG_WAN_CONNCTION_LOST 45
+#define REQUEST_GET_NEXT_OBJ 0
+#define RESPONSE_NO_MORE_INSTANCE 1
+#define REQUEST_GET_OBJ 2
+#define RESPONSE_GET_SUCCESS 3
+#define RESPONSE_GET_EMPTY 4
+#define RESPONSE_GET_FAIL 5
+#define REQUEST_SET_OBJ 6
+#define REQUEST_SET_MULTI_OBJ 7
+#define REQUEST_ADD_INSTANCE 8
+#define REQUEST_DEL_INSTANCE 9
+#define REQUEST_FIRMWARE_UPGRADE 10
+#define REQUEST_RESTORE_DEFAULT 11
+#define RESPONSE_SUCCESS (12 | ZCFG_NO_WAIT_REPLY)
+#define RESPONSE_FAIL (13 | ZCFG_NO_WAIT_REPLY)
+#define REQUEST_GET_NEXT_SUB 14
+#define REQUEST_GET_PARAM_ATTR 15
+#define REQUEST_SET_PARAM_ATTR 16
+#define RESPONSE_WRITE_OBJ_SUCCESS 17
+#define RESPONSE_WRITE_OBJ_FAIL 18
+#define ZCFG_MSG_DELAY_APPLY 19
+#define ZCFG_MSG_RE_APPLY 20
+#define REQUEST_SET_WITHOUT_APPLY 21
+#define REQUEST_ROMD_UPGRADE 22
+#define REQUEST_GET_OBJ_WITHOUT_UPDATE 23
+#define REQUEST_CONFIG_BACKUP 24
+#define ZCFG_MSG_UPNP_PORTMAP_GET 25
+
+#define REQUEST_GET_NEXT_OBJ_WITHOUT_UPDATE 27
+#define REQUEST_GET_NEXT_SUB_WITHOUT_UPDATE 28
+#define ZCFG_MSG_VOICE_STATS_GET 29
+#define ZCFG_MSG_VOICE_CONTROL 30
+#define ZCFG_MSG_VOICE_DEBUG_AND_TEST 31
+#define REQUEST_REINIT_MACLESS_PROVISIONING 32
+#define ZCFG_MSG_DECT_CONTROL 33
+#define ZCFG_MSG_DECT_STATS_GET 34
+#define ZCFG_MSG_GET_TR98_ALL_IGD_NAMES 36
+#define ZCFG_MSG_MCPCTL 37
+#define ZCFG_MSG_CLEAN_ROMD 38
+#define ZCFG_MSG_SAVE_ROMD 39
+#define ZCFG_MSG_VOICE_LIST_ACCESS 40
+#define REQUEST_FIRMWARE_UPGRADE_CHK 41
+#define ZCFG_MSG_MAIL_SEND_EVENT 42
+#define REQUEST_RESTORE_DEFAULT_CHK 43
+#define ZCFG_MSG_WAN_CONNCTION_READY 44
+#define ZCFG_MSG_WAN_CONNCTION_LOST 45
#if 1 /* __ZyXEL__, Albert, 20150520, Supports PPPoE Connection Delay and LCP Echo */
-#define ZCFG_MSG_PPP_LCP_ECHO_GET 46
+#define ZCFG_MSG_PPP_LCP_ECHO_GET 46
#endif
/* __ZyXEL__, Albert, 20150622, Support DHCP option125 */
-#define ZCFG_MSG_DHCP_OPTIONI125_CHK 49
-#define ZCFG_MSG_VOICE_CAP_GET 50
+#define ZCFG_MSG_DHCP_OPTIONI125_CHK 49
+#define ZCFG_MSG_VOICE_CAP_GET 50
/* Connect/Disconnect PPP by Status page */
-#define ZCFG_MSG_WAN_PPP_DISCONNECT 51
-#define ZCFG_MSG_WAN_PPP_CONNECT 52
+#define ZCFG_MSG_WAN_PPP_DISCONNECT 51
+#define ZCFG_MSG_WAN_PPP_CONNECT 52
/* Release/Renew IP by Status page */
-#define ZCFG_MSG_WAN_IP_RELEASE 53
-#define ZCFG_MSG_WAN_IP_RENEW 54
-#define REQUEST_FIRMWARE_WRITE_ONLY 55
-#define REQUEST_GET_WHOLE_OBJ_BY_NAME 56
-#define REQUEST_SET_WHOLE_OBJ_BY_NAME 57
+#define ZCFG_MSG_WAN_IP_RELEASE 53
+#define ZCFG_MSG_WAN_IP_RENEW 54
+#define REQUEST_FIRMWARE_WRITE_ONLY 55
+#define REQUEST_GET_WHOLE_OBJ_BY_NAME 56
+#define REQUEST_SET_WHOLE_OBJ_BY_NAME 57
-#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
-#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
+#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
+#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
/*Test Use*/
-#define ZCFG_MSG_REPLY 101
-#define ZCFG_MSG_HELLO 102
-#define ZCFG_MSG_NO_REPLY (101 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_REPLY 101
+#define ZCFG_MSG_HELLO 102
+#define ZCFG_MSG_NO_REPLY (101 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_REQUEST_TR98_OBJMAPPING 103
-#define ZCFG_MSG_REQUEST_TR181_OBJMAPPING 104
-#define ZCFG_MSG_NOTIFY_TR69_TR98 (105 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_ADD_TR98_MAPPING 106
-#define ZCFG_MSG_UPDATE_PARAMETER_NOTIFY (120 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_HOSTS 121
+#define ZCFG_MSG_REQUEST_TR98_OBJMAPPING 103
+#define ZCFG_MSG_REQUEST_TR181_OBJMAPPING 104
+#define ZCFG_MSG_NOTIFY_TR69_TR98 (105 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_ADD_TR98_MAPPING 106
+#define ZCFG_MSG_UPDATE_PARAMETER_NOTIFY (120 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_HOSTS 121
-#define ZCFG_MSG_REQUEST_DELAY_DELETE 130
+#define ZCFG_MSG_REQUEST_DELAY_DELETE 130
-#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_STATUS 131
-#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_STATUS 132
+#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_STATUS 131
+#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_STATUS 132
-#define ZCFG_MSG_REQUEST_GET_PARAM_ATTR_LIST 133
+#define ZCFG_MSG_REQUEST_GET_PARAM_ATTR_LIST 133
-#define REQUEST_QUERY_OBJ_PARAM_ATTR 134
+#define REQUEST_QUERY_OBJ_PARAM_ATTR 134
-#define REQUEST_QUERY_OBJ_EXIST 135
+#define REQUEST_QUERY_OBJ_EXIST 135
-#define ZCFG_MSG_LOG_SETTING_CONFIG (136 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_LOG_SETTING_CONFIG (136 | ZCFG_NO_WAIT_REPLY)
-#define REQUEST_QUERY_TR98_OBJ_INSTANCE_ARRAY 140
-#define REQUEST_QUERY_TR181_OBJ_INSTANCE_ARRAY 141
+#define REQUEST_QUERY_TR98_OBJ_INSTANCE_ARRAY 140
+#define REQUEST_QUERY_TR181_OBJ_INSTANCE_ARRAY 141
/* ZCFG message type without waiting reply*/
-#define ZCFG_MSG_LAN_IP_CONNECTION_UP (1 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DHCPC_BOUND (2 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DHCPC_DECONFIG (3 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DHCPC_RELEASE (4 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PPPD_EVENT (5 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WAN_IP_CONNECTION_UP (6 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WAN_LINK_STATUS (7 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PARAMETER_CHANGED_NOTIFY (8 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WAN_PPP_CONNECTION_UP (9 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WAN_CONNECTION_READY (10 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WAN_CONNECTION_LOST (11 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_LAN_MAC_CONTROL_EVENT (12 | ZCFG_NO_WAIT_REPLY) /*For MAC Filter*/
-#define ZCFG_MSG_VOICE_CONNECTION_CHANGE (13 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VOICE_CONNECTION_LOST (14 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VOICE_DYNAMIC_INSTANCE_CHANGED (15 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VOICE_STATIC_CONFIG_CHANGED (16 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VOICE_CONFIG_SAVED (17 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_INIT_WAN_LINK_INFO (18 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_REBOOT_SYSTEM (19 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PING_MSG (20 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_TRACERT_MSG (21 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DHCP6C_STATE_CHANGED (22 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_MGABDEV_DETECT (23 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_RA_INFO (24 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_MGMT_NAT_DETECT (25 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_MGMT_NAT_CLEAR (26 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_MGMT_UDP_CONNREQ (27 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_MGMT_DIAGNOSTIC_COMPLETE (28 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_NSLOOKUP_MSG (29 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_ATM_OAM_F5_COMPLETE (30 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_ATM_OAM_F4_COMPLETE (31 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VC_AUTOHUNT_START (32 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VC_AUTOHUNT_STOP (33 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_HTTP_TIMEOUT_CONFIG (34 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_NTP_SYNC_SUCCESS (35 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_STB_VENDOR_ID_FIND (36 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_AUTO_PROVISION (37 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_TR64_DEVICE_UPDATE (38 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_INIT_DATAMODEL_FIN (39 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VLAN_AUTOHUNT_START (40 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VLAN_AUTOHUNT_STOP (41 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VLAN_HUNT_SUCCESS (42 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VLAN_HUNT_FAIL (43 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VLAN_HUNT_SET_TIMEOUT (44 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_MGMT_CONNECT_UPDATE (45 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DOWNLOAD_DIAG_COMPLETE_EVENT (46 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_TR64_LAN_DEVICE_UPDATE (47 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_LAN_IP_CONNECTION_UP (1 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DHCPC_BOUND (2 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DHCPC_DECONFIG (3 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DHCPC_RELEASE (4 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PPPD_EVENT (5 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_IP_CONNECTION_UP (6 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_LINK_STATUS (7 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PARAMETER_CHANGED_NOTIFY (8 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_PPP_CONNECTION_UP (9 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_CONNECTION_READY (10 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_CONNECTION_LOST (11 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_LAN_MAC_CONTROL_EVENT (12 | ZCFG_NO_WAIT_REPLY) /*For MAC Filter*/
+#define ZCFG_MSG_VOICE_CONNECTION_CHANGE (13 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VOICE_CONNECTION_LOST (14 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VOICE_DYNAMIC_INSTANCE_CHANGED (15 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VOICE_STATIC_CONFIG_CHANGED (16 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VOICE_CONFIG_SAVED (17 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_INIT_WAN_LINK_INFO (18 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_REBOOT_SYSTEM (19 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PING_MSG (20 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_TRACERT_MSG (21 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DHCP6C_STATE_CHANGED (22 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_MGABDEV_DETECT (23 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_RA_INFO (24 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_MGMT_NAT_DETECT (25 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_MGMT_NAT_CLEAR (26 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_MGMT_UDP_CONNREQ (27 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_MGMT_DIAGNOSTIC_COMPLETE (28 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_NSLOOKUP_MSG (29 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_ATM_OAM_F5_COMPLETE (30 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_ATM_OAM_F4_COMPLETE (31 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VC_AUTOHUNT_START (32 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VC_AUTOHUNT_STOP (33 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_HTTP_TIMEOUT_CONFIG (34 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_NTP_SYNC_SUCCESS (35 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_STB_VENDOR_ID_FIND (36 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_AUTO_PROVISION (37 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_TR64_DEVICE_UPDATE (38 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_INIT_DATAMODEL_FIN (39 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VLAN_AUTOHUNT_START (40 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VLAN_AUTOHUNT_STOP (41 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VLAN_HUNT_SUCCESS (42 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VLAN_HUNT_FAIL (43 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VLAN_HUNT_SET_TIMEOUT (44 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_MGMT_CONNECT_UPDATE (45 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DOWNLOAD_DIAG_COMPLETE_EVENT (46 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_TR64_LAN_DEVICE_UPDATE (47 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_VOICE_CONFIG_CHANGED_PARTIAL_RELOAD (48 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DHCPC_RENEW (52 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_AUTOHUNT_FINISH (53 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_ETHWAN_TR69_PROVISION_SUCCESS (54 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VLAN_HUNT_TERMINATE (55 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_AUTO_RSV_IP (56 | ZCFG_NO_WAIT_REPLY)//ch_wang
-#define ZCFG_MSG_UPLOAD_DIAG_COMPLETE_EVENT (58 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DHCPD_OPTION (59 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DHCPC_RENEW (52 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_AUTOHUNT_FINISH (53 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_ETHWAN_TR69_PROVISION_SUCCESS (54 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VLAN_HUNT_TERMINATE (55 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_AUTO_RSV_IP (56 | ZCFG_NO_WAIT_REPLY)//ch_wang
+#define ZCFG_MSG_UPLOAD_DIAG_COMPLETE_EVENT (58 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DHCPD_OPTION (59 | ZCFG_NO_WAIT_REPLY)
#ifdef ZYXEL_WIND_ITALY_CUSTOMIZATION
-#define ZCFG_MSG_SIP_WAN_CHK (60 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_SIP_WAN_CHK (60 | ZCFG_NO_WAIT_REPLY)
#endif
-#define ZCFG_MSG_CLEAN_ROMD_NO_REPLY (60 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_SAVE_ROMD_NO_REPLY (61 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_CLEAN_ROMD_NO_REPLY (60 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_SAVE_ROMD_NO_REPLY (61 | ZCFG_NO_WAIT_REPLY)
#if 1 //ZyXEL, Renew add WAN release/renew command, Albert
-#define ZCFG_MSG_WAN_PPP_DISCONNECTED (66 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WAN_PPP_CONNECTING (67 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_PPP_DISCONNECTED (66 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_PPP_CONNECTING (67 | ZCFG_NO_WAIT_REPLY)
#endif
-#define ZCFG_MSG_WNA_INTERNET_LED_UPDATE (68 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_ON (69 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_OFF (70 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_ON (71 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_OFF (72 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WNA_INTERNET_LED_UPDATE (68 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_ON (69 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_OFF (70 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_ON (71 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_OFF (72 | ZCFG_NO_WAIT_REPLY)
#ifdef SUPPORT_PROXIMITY_SENSOR
-#define ZCFG_MSG_PROXIMITY_SENSOR_ON (73 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PROXIMITY_SENSOR_OFF (74 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PROXIMITY_SENSOR_ON (73 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PROXIMITY_SENSOR_OFF (74 | ZCFG_NO_WAIT_REPLY)
#endif
-#define ZCFG_MSG_ZYAUTOPROVISION (75 | ZCFG_NO_WAIT_REPLY)//Miles_Lin
+#define ZCFG_MSG_ZYAUTOPROVISION (75 | ZCFG_NO_WAIT_REPLY)//Miles_Lin
#ifdef ZYXEL_POWER_MGMT
-#define ZCFG_MSG_POWER_MGMT_LED_ON (76 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_POWER_MGMT_LED_OFF (77 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_POWER_MGMT_LED_ON (76 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_POWER_MGMT_LED_OFF (77 | ZCFG_NO_WAIT_REPLY)
#endif
//Zyxel, TimLiu, need to wait the swap process complete!
-#define ZCFG_MSG_REQ_SWITCH_BOOT_PARTITION 78
+#define ZCFG_MSG_REQ_SWITCH_BOOT_PARTITION 78
//Zyxel, CjLai
-#define ZCFG_MSG_RESET_ACCOUNT_DEFAULT (79 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_RESET_ACCOUNT_DEFAULT (79 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PINGSVRS_RST (80 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PINGSVRS_RST (80 | ZCFG_NO_WAIT_REPLY)
/* WIFI message */
-#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WIFI_RELOAD (501 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WIFI_UPDATE_LANINFO (502 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WIFI_GET_LIST 503
-#define ZCFG_MSG_WPS_RELOAD (504 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WPS_HWBTN_PRESS 505
-#define ZCFG_MSG_WPS_SWBTN_PRESS 506
-#define ZCFG_MSG_WPS_START_STAPIN 507
-#define ZCFG_MSG_WDS_SCAN 508
-#define ZCFG_MSG_WIFI_STA_FILTER (509 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_CHANNEL_SCAN 510
-#define ZCFG_MSG_GET_CHANNEL_INFO 511
-#define ZCFG_MSG_WIFI_ST_UPDATE 512
-#define ZCFG_MSG_WIFI_RELOAD_CHECK 513
-#define ZCFG_MSG_WIFI_LED_ENABLE (514 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WPS_ACTION_CANCEL 515
-#define ZCFG_MSG_WPS_UPDATE_CONFIG 516
-#define ZCFG_MSG_WLAN_GET_CMD 520
-#define ZCFG_MSG_WLAN_SET_CMD 521
-#define ZCFG_MSG_WIFI_RELOAD_DELAY (522 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WIFI_RELOAD (501 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WIFI_UPDATE_LANINFO (502 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WIFI_GET_LIST 503
+#define ZCFG_MSG_WPS_RELOAD (504 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WPS_HWBTN_PRESS 505
+#define ZCFG_MSG_WPS_SWBTN_PRESS 506
+#define ZCFG_MSG_WPS_START_STAPIN 507
+#define ZCFG_MSG_WDS_SCAN 508
+#define ZCFG_MSG_WIFI_STA_FILTER (509 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_CHANNEL_SCAN 510
+#define ZCFG_MSG_GET_CHANNEL_INFO 511
+#define ZCFG_MSG_WIFI_ST_UPDATE 512
+#define ZCFG_MSG_WIFI_RELOAD_CHECK 513
+#define ZCFG_MSG_WIFI_LED_ENABLE (514 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WPS_ACTION_CANCEL 515
+#define ZCFG_MSG_WPS_UPDATE_CONFIG 516
+#define ZCFG_MSG_WLAN_GET_CMD 520
+#define ZCFG_MSG_WLAN_SET_CMD 521
+#define ZCFG_MSG_WIFI_RELOAD_DELAY (522 | ZCFG_NO_WAIT_REPLY)
#if 1 /* #36467, MAC filter with SONiQ, cpwang, 2017-04-18 10:56:46 */
-#define ZCFG_MSG_BSA_STA_FILTER (523 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_BSA_STA_FILTER (523 | ZCFG_NO_WAIT_REPLY)
#endif /* #36467, MAC filter with SONiQ, cpwang, 2017-04-18 10:56:46 */
#ifdef BUILD_SONIQ
-#define ZCFG_MSG_ENABLE_SONiQ (524 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PRESET_SSID_EN (525 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_GET_LINK_RATE 526
-#define ZCFG_MSG_CFG_DISTRIBUTE (527 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_CFG_GET_DIST_STATUS 528
-#define ZCFG_MSG_PRESET_SSID_DIS (529 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_ENABLE_SONiQ (524 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PRESET_SSID_EN (525 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_GET_LINK_RATE 526
+#define ZCFG_MSG_CFG_DISTRIBUTE (527 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_CFG_GET_DIST_STATUS 528
+#define ZCFG_MSG_PRESET_SSID_DIS (529 | ZCFG_NO_WAIT_REPLY)
#endif
-#define ZCFG_MSG_FAKEROOT_COMMAND (800 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_FAKEROOT_SYS_ATSH 801 /* Fakeroot for "sys atsh" */
+#define ZCFG_MSG_FAKEROOT_COMMAND (800 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_FAKEROOT_SYS_ATSH 801 /* Fakeroot for "sys atsh" */
#if 1 /* __ZyXEL__, Albert, 20150416, Web redirect */
-#define ZCFG_MSG_WIFI_WEB_REDIRECT_CHECK (961 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PPP_AUTH_FAIL (962 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WIFI_WEB_REDIRECT_CHECK (961 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PPP_AUTH_FAIL (962 | ZCFG_NO_WAIT_REPLY)
#endif
-#define ZCFG_MSG_UPDATE_ONE_CONNECT (963 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPDATE_ONE_CONNECT (963 | ZCFG_NO_WAIT_REPLY)
/* end ZCFG message type */
-#define ZCFG_MSG_REQ_REBOOT (964 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_REQ_SYNCFLASH (965 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_REQ_REBOOT (964 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_REQ_SYNCFLASH (965 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_ADDRESS_PREFIX "/var/lib/.sock/zcfg_sockaddr"
-#define ZCFG_MSG_BACKLOG 5
+#define ZCFG_ADDRESS_PREFIX "/var/lib/.sock/zcfg_sockaddr"
+#define ZCFG_MSG_BACKLOG 5
//==============================================================================
typedef uint8_t zcfg_msg_eid_t;
package/public-zyxel/libzcfg_msg/patches/113-ZYXEL_BUGFIX_mail_send_event_change_to_no_reply_chengtu.patch
Executable
+21
View File
@@ -0,0 +1,21 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-10-26 14:01:48.006970787 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-10-26 14:06:15.514968900 +0800
@@ -60,7 +60,7 @@
#define ZCFG_MSG_SAVE_ROMD 39
#define ZCFG_MSG_VOICE_LIST_ACCESS 40
#define REQUEST_FIRMWARE_UPGRADE_CHK 41
-#define ZCFG_MSG_MAIL_SEND_EVENT 42
+//#define ZCFG_MSG_MAIL_SEND_EVENT 42
#define REQUEST_RESTORE_DEFAULT_CHK 43
#define ZCFG_MSG_WAN_CONNCTION_READY 44
#define ZCFG_MSG_WAN_CONNCTION_LOST 45
@@ -197,6 +197,7 @@
#define ZCFG_MSG_RESET_ACCOUNT_DEFAULT (79 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_PINGSVRS_RST (80 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_MAIL_SEND_EVENT (81 | ZCFG_NO_WAIT_REPLY)
/* WIFI message */
#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/114-ZYXEL_ENHACE_add_tr069_param_ipv6spec_object_dhcp_serverR_JaniceJhuang.patch
+30
View File
@@ -0,0 +1,30 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-10-27 09:08:49.350776648 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-10-27 19:35:59.992291535 +0800
@@ -198,6 +198,9 @@
#define ZCFG_MSG_PINGSVRS_RST (80 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_MAIL_SEND_EVENT (81 | ZCFG_NO_WAIT_REPLY)
+#ifdef ZYXEL_DHCPV6S_LEASE
+#define ZCFG_MSG_DHCP6S_STATE (82 | ZCFG_NO_WAIT_REPLY)
+#endif
/* WIFI message */
#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
Index: libzcfg_msg-1.0/Makefile
===================================================================
--- libzcfg_msg-1.0.orig/Makefile 2017-10-27 09:08:49.090905186 +0800
+++ libzcfg_msg-1.0/Makefile 2017-10-27 19:37:29.240680535 +0800
@@ -23,6 +23,11 @@
CFLAGS += -DZCFG_LOG_USE_DEBUGCFG
endif
+#DHCPv6s
+ifeq ($(CONFIG_ZYXEL_DHCPV6S_LEASE),y)
+CFLAGS += -DZYXEL_DHCPV6S_LEASE
+endif
+
.PHONY : libzcfg_msg
all: clean libzcfg_msg
package/public-zyxel/libzcfg_msg/patches/115-ZYXEL_BUGFIX_remove_flag_on_ipv6spec_object_param_JaniceJhuang.patch
Executable
+29
View File
@@ -0,0 +1,29 @@
Index: libzcfg_msg-1.0/Makefile
===================================================================
--- libzcfg_msg-1.0.orig/Makefile 2017-10-30 08:55:27.527007085 +0800
+++ libzcfg_msg-1.0/Makefile 2017-10-30 08:57:55.375119573 +0800
@@ -23,10 +23,6 @@
CFLAGS += -DZCFG_LOG_USE_DEBUGCFG
endif
-#DHCPv6s
-ifeq ($(CONFIG_ZYXEL_DHCPV6S_LEASE),y)
-CFLAGS += -DZYXEL_DHCPV6S_LEASE
-endif
.PHONY : libzcfg_msg
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-10-30 08:55:27.527007085 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-10-30 08:57:50.031867483 +0800
@@ -198,9 +198,7 @@
#define ZCFG_MSG_PINGSVRS_RST (80 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_MAIL_SEND_EVENT (81 | ZCFG_NO_WAIT_REPLY)
-#ifdef ZYXEL_DHCPV6S_LEASE
#define ZCFG_MSG_DHCP6S_STATE (82 | ZCFG_NO_WAIT_REPLY)
-#endif
/* WIFI message */
#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
package/public-zyxel/libzcfg_msg/patches/116-ZYXEL_ENHANCE_New_status_parameters_for_app_DerekYu.patch
+14
View File
@@ -0,0 +1,14 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-11-01 16:48:53.624236423 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-11-01 16:50:05.870594730 +0800
@@ -228,9 +228,6 @@
#ifdef BUILD_SONIQ
#define ZCFG_MSG_ENABLE_SONiQ (524 | ZCFG_NO_WAIT_REPLY)
#define ZCFG_MSG_PRESET_SSID_EN (525 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_GET_LINK_RATE 526
-#define ZCFG_MSG_CFG_DISTRIBUTE (527 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_CFG_GET_DIST_STATUS 528
#define ZCFG_MSG_PRESET_SSID_DIS (529 | ZCFG_NO_WAIT_REPLY)
#endif
package/public-zyxel/libzcfg_msg/patches/117-ZYXEL_ENHANCE_clear_msg_type_CPWang.patch
Executable
+537
View File
@@ -0,0 +1,537 @@
Index: libzcfg_msg-1.0/zcfg_msg.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg.h 2017-11-03 15:52:33.391119004 +0800
+++ libzcfg_msg-1.0/zcfg_msg.h 2017-11-03 16:07:55.277654189 +0800
@@ -3,247 +3,9 @@
#include "zcfg_common.h"
#include "zcfg_eid.h"
+#include "zcfg_msg_type.h"
-#if 1 /* other modules use this, so these can not be removed. However, wiered ! */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#endif
-
-#define ERROR_APPLY_MSG -1
-
-#define ZCFG_NO_WAIT_REPLY (1 << 31)
-#if 1 /* non-blocking config apply, ZyXEL, John */
-#define ZCFG_BLOCK_MODE_CONFIG_APPLY (1 << 30)
-#endif
-#define ZCFG_PARTIAL_OBJECT_SET (1 << 29)
-
-/* ZCFG message type with waiting reply*/
-#define REQUEST_GET_NEXT_OBJ 0
-#define RESPONSE_NO_MORE_INSTANCE 1
-#define REQUEST_GET_OBJ 2
-#define RESPONSE_GET_SUCCESS 3
-#define RESPONSE_GET_EMPTY 4
-#define RESPONSE_GET_FAIL 5
-#define REQUEST_SET_OBJ 6
-#define REQUEST_SET_MULTI_OBJ 7
-#define REQUEST_ADD_INSTANCE 8
-#define REQUEST_DEL_INSTANCE 9
-#define REQUEST_FIRMWARE_UPGRADE 10
-#define REQUEST_RESTORE_DEFAULT 11
-#define RESPONSE_SUCCESS (12 | ZCFG_NO_WAIT_REPLY)
-#define RESPONSE_FAIL (13 | ZCFG_NO_WAIT_REPLY)
-#define REQUEST_GET_NEXT_SUB 14
-#define REQUEST_GET_PARAM_ATTR 15
-#define REQUEST_SET_PARAM_ATTR 16
-#define RESPONSE_WRITE_OBJ_SUCCESS 17
-#define RESPONSE_WRITE_OBJ_FAIL 18
-#define ZCFG_MSG_DELAY_APPLY 19
-#define ZCFG_MSG_RE_APPLY 20
-#define REQUEST_SET_WITHOUT_APPLY 21
-#define REQUEST_ROMD_UPGRADE 22
-#define REQUEST_GET_OBJ_WITHOUT_UPDATE 23
-#define REQUEST_CONFIG_BACKUP 24
-#define ZCFG_MSG_UPNP_PORTMAP_GET 25
-
-#define REQUEST_GET_NEXT_OBJ_WITHOUT_UPDATE 27
-#define REQUEST_GET_NEXT_SUB_WITHOUT_UPDATE 28
-#define ZCFG_MSG_VOICE_STATS_GET 29
-#define ZCFG_MSG_VOICE_CONTROL 30
-#define ZCFG_MSG_VOICE_DEBUG_AND_TEST 31
-#define REQUEST_REINIT_MACLESS_PROVISIONING 32
-#define ZCFG_MSG_DECT_CONTROL 33
-#define ZCFG_MSG_DECT_STATS_GET 34
-#define ZCFG_MSG_GET_TR98_ALL_IGD_NAMES 36
-#define ZCFG_MSG_MCPCTL 37
-#define ZCFG_MSG_CLEAN_ROMD 38
-#define ZCFG_MSG_SAVE_ROMD 39
-#define ZCFG_MSG_VOICE_LIST_ACCESS 40
-#define REQUEST_FIRMWARE_UPGRADE_CHK 41
-//#define ZCFG_MSG_MAIL_SEND_EVENT 42
-#define REQUEST_RESTORE_DEFAULT_CHK 43
-#define ZCFG_MSG_WAN_CONNCTION_READY 44
-#define ZCFG_MSG_WAN_CONNCTION_LOST 45
-
-#if 1 /* __ZyXEL__, Albert, 20150520, Supports PPPoE Connection Delay and LCP Echo */
-#define ZCFG_MSG_PPP_LCP_ECHO_GET 46
-#endif
-/* __ZyXEL__, Albert, 20150622, Support DHCP option125 */
-#define ZCFG_MSG_DHCP_OPTIONI125_CHK 49
-#define ZCFG_MSG_VOICE_CAP_GET 50
-/* Connect/Disconnect PPP by Status page */
-#define ZCFG_MSG_WAN_PPP_DISCONNECT 51
-#define ZCFG_MSG_WAN_PPP_CONNECT 52
-/* Release/Renew IP by Status page */
-#define ZCFG_MSG_WAN_IP_RELEASE 53
-#define ZCFG_MSG_WAN_IP_RENEW 54
-#define REQUEST_FIRMWARE_WRITE_ONLY 55
-#define REQUEST_GET_WHOLE_OBJ_BY_NAME 56
-#define REQUEST_SET_WHOLE_OBJ_BY_NAME 57
-
-#define ZCFG_MSG_REQUEST_TR98_MAPPING 99 /*Request for tr181 object name related with tr98*/
-#define ZCFG_MSG_REQUEST_TR181_MAPPING 100 /*Request for tr98 object name related with tr181*/
-
-/*Test Use*/
-#define ZCFG_MSG_REPLY 101
-#define ZCFG_MSG_HELLO 102
-#define ZCFG_MSG_NO_REPLY (101 | ZCFG_NO_WAIT_REPLY)
-
-#define ZCFG_MSG_REQUEST_TR98_OBJMAPPING 103
-#define ZCFG_MSG_REQUEST_TR181_OBJMAPPING 104
-#define ZCFG_MSG_NOTIFY_TR69_TR98 (105 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_ADD_TR98_MAPPING 106
-#define ZCFG_MSG_UPDATE_PARAMETER_NOTIFY (120 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_HOSTS 121
-
-#define ZCFG_MSG_REQUEST_DELAY_DELETE 130
-
-#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_STATUS 131
-#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_STATUS 132
-
-#define ZCFG_MSG_REQUEST_GET_PARAM_ATTR_LIST 133
-
-#define REQUEST_QUERY_OBJ_PARAM_ATTR 134
-
-#define REQUEST_QUERY_OBJ_EXIST 135
-
-#define ZCFG_MSG_LOG_SETTING_CONFIG (136 | ZCFG_NO_WAIT_REPLY)
-
-#define REQUEST_QUERY_TR98_OBJ_INSTANCE_ARRAY 140
-#define REQUEST_QUERY_TR181_OBJ_INSTANCE_ARRAY 141
-/* ZCFG message type without waiting reply*/
-#define ZCFG_MSG_LAN_IP_CONNECTION_UP (1 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DHCPC_BOUND (2 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DHCPC_DECONFIG (3 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DHCPC_RELEASE (4 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PPPD_EVENT (5 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WAN_IP_CONNECTION_UP (6 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WAN_LINK_STATUS (7 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PARAMETER_CHANGED_NOTIFY (8 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WAN_PPP_CONNECTION_UP (9 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WAN_CONNECTION_READY (10 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WAN_CONNECTION_LOST (11 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_LAN_MAC_CONTROL_EVENT (12 | ZCFG_NO_WAIT_REPLY) /*For MAC Filter*/
-#define ZCFG_MSG_VOICE_CONNECTION_CHANGE (13 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VOICE_CONNECTION_LOST (14 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VOICE_DYNAMIC_INSTANCE_CHANGED (15 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VOICE_STATIC_CONFIG_CHANGED (16 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VOICE_CONFIG_SAVED (17 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_INIT_WAN_LINK_INFO (18 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_REBOOT_SYSTEM (19 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PING_MSG (20 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_TRACERT_MSG (21 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DHCP6C_STATE_CHANGED (22 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_MGABDEV_DETECT (23 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_RA_INFO (24 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_MGMT_NAT_DETECT (25 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_MGMT_NAT_CLEAR (26 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_MGMT_UDP_CONNREQ (27 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_MGMT_DIAGNOSTIC_COMPLETE (28 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_NSLOOKUP_MSG (29 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_ATM_OAM_F5_COMPLETE (30 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_ATM_OAM_F4_COMPLETE (31 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VC_AUTOHUNT_START (32 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VC_AUTOHUNT_STOP (33 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_HTTP_TIMEOUT_CONFIG (34 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_NTP_SYNC_SUCCESS (35 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_STB_VENDOR_ID_FIND (36 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_AUTO_PROVISION (37 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_TR64_DEVICE_UPDATE (38 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_INIT_DATAMODEL_FIN (39 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VLAN_AUTOHUNT_START (40 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VLAN_AUTOHUNT_STOP (41 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VLAN_HUNT_SUCCESS (42 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VLAN_HUNT_FAIL (43 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VLAN_HUNT_SET_TIMEOUT (44 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_MGMT_CONNECT_UPDATE (45 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DOWNLOAD_DIAG_COMPLETE_EVENT (46 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_TR64_LAN_DEVICE_UPDATE (47 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VOICE_CONFIG_CHANGED_PARTIAL_RELOAD (48 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DHCPC_RENEW (52 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_AUTOHUNT_FINISH (53 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_ETHWAN_TR69_PROVISION_SUCCESS (54 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_VLAN_HUNT_TERMINATE (55 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_AUTO_RSV_IP (56 | ZCFG_NO_WAIT_REPLY)//ch_wang
-#define ZCFG_MSG_UPLOAD_DIAG_COMPLETE_EVENT (58 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DHCPD_OPTION (59 | ZCFG_NO_WAIT_REPLY)
-#ifdef ZYXEL_WIND_ITALY_CUSTOMIZATION
-#define ZCFG_MSG_SIP_WAN_CHK (60 | ZCFG_NO_WAIT_REPLY)
-#endif
-#define ZCFG_MSG_CLEAN_ROMD_NO_REPLY (60 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_SAVE_ROMD_NO_REPLY (61 | ZCFG_NO_WAIT_REPLY)
-#if 1 //ZyXEL, Renew add WAN release/renew command, Albert
-#define ZCFG_MSG_WAN_PPP_DISCONNECTED (66 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WAN_PPP_CONNECTING (67 | ZCFG_NO_WAIT_REPLY)
-#endif
-#define ZCFG_MSG_WNA_INTERNET_LED_UPDATE (68 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_ON (69 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_OFF (70 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_ON (71 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_OFF (72 | ZCFG_NO_WAIT_REPLY)
-#ifdef SUPPORT_PROXIMITY_SENSOR
-#define ZCFG_MSG_PROXIMITY_SENSOR_ON (73 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PROXIMITY_SENSOR_OFF (74 | ZCFG_NO_WAIT_REPLY)
-#endif
-#define ZCFG_MSG_ZYAUTOPROVISION (75 | ZCFG_NO_WAIT_REPLY)//Miles_Lin
-#ifdef ZYXEL_POWER_MGMT
-#define ZCFG_MSG_POWER_MGMT_LED_ON (76 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_POWER_MGMT_LED_OFF (77 | ZCFG_NO_WAIT_REPLY)
-#endif
-//Zyxel, TimLiu, need to wait the swap process complete!
-#define ZCFG_MSG_REQ_SWITCH_BOOT_PARTITION 78
-
-//Zyxel, CjLai
-#define ZCFG_MSG_RESET_ACCOUNT_DEFAULT (79 | ZCFG_NO_WAIT_REPLY)
-
-#define ZCFG_MSG_PINGSVRS_RST (80 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_MAIL_SEND_EVENT (81 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_DHCP6S_STATE (82 | ZCFG_NO_WAIT_REPLY)
-
-/* WIFI message */
-#define ZCFG_MSG_WIFI_INIT (500 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WIFI_RELOAD (501 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WIFI_UPDATE_LANINFO (502 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WIFI_GET_LIST 503
-#define ZCFG_MSG_WPS_RELOAD (504 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WPS_HWBTN_PRESS 505
-#define ZCFG_MSG_WPS_SWBTN_PRESS 506
-#define ZCFG_MSG_WPS_START_STAPIN 507
-#define ZCFG_MSG_WDS_SCAN 508
-#define ZCFG_MSG_WIFI_STA_FILTER (509 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_CHANNEL_SCAN 510
-#define ZCFG_MSG_GET_CHANNEL_INFO 511
-#define ZCFG_MSG_WIFI_ST_UPDATE 512
-#define ZCFG_MSG_WIFI_RELOAD_CHECK 513
-#define ZCFG_MSG_WIFI_LED_ENABLE (514 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_WPS_ACTION_CANCEL 515
-#define ZCFG_MSG_WPS_UPDATE_CONFIG 516
-#define ZCFG_MSG_WLAN_GET_CMD 520
-#define ZCFG_MSG_WLAN_SET_CMD 521
-#define ZCFG_MSG_WIFI_RELOAD_DELAY (522 | ZCFG_NO_WAIT_REPLY)
-
-#if 1 /* #36467, MAC filter with SONiQ, cpwang, 2017-04-18 10:56:46 */
-#define ZCFG_MSG_BSA_STA_FILTER (523 | ZCFG_NO_WAIT_REPLY)
-#endif /* #36467, MAC filter with SONiQ, cpwang, 2017-04-18 10:56:46 */
-#ifdef BUILD_SONIQ
-#define ZCFG_MSG_ENABLE_SONiQ (524 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PRESET_SSID_EN (525 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PRESET_SSID_DIS (529 | ZCFG_NO_WAIT_REPLY)
-#endif
-
-#define ZCFG_MSG_FAKEROOT_COMMAND (800 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_FAKEROOT_SYS_ATSH 801 /* Fakeroot for "sys atsh" */
-
-#if 1 /* __ZyXEL__, Albert, 20150416, Web redirect */
-#define ZCFG_MSG_WIFI_WEB_REDIRECT_CHECK (961 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_PPP_AUTH_FAIL (962 | ZCFG_NO_WAIT_REPLY)
-#endif
-#define ZCFG_MSG_UPDATE_ONE_CONNECT (963 | ZCFG_NO_WAIT_REPLY)
-/* end ZCFG message type */
-
-#define ZCFG_MSG_REQ_REBOOT (964 | ZCFG_NO_WAIT_REPLY)
-#define ZCFG_MSG_REQ_SYNCFLASH (965 | ZCFG_NO_WAIT_REPLY)
-
+//==============================================================================
#define ZCFG_ADDRESS_PREFIX "/var/lib/.sock/zcfg_sockaddr"
#define ZCFG_MSG_BACKLOG 5
@@ -301,7 +63,7 @@
* ZCFG_TIMEOUT time out
* others failed
*
- * @note call should free recvBuf after using it.
+ * @note caller should free recvBuf after using it.
*/
zcfgRet_t zcfg_msg_serverRecv(
zcfgMsg_t **recvBuf,
@@ -332,7 +94,7 @@
* ZCFG_TIMEOUT time out
* others failed
*
- * @note call should free recvBuf after using it if ZCFG_SUCCESS.
+ * @note caller should free recvBuf after using it if ZCFG_SUCCESS.
*/
zcfgRet_t zcfg_msg_sendAndGetReply(
zcfgMsg_t *sendMsg,
Index: libzcfg_msg-1.0/zcfg_msg_type.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ libzcfg_msg-1.0/zcfg_msg_type.h 2017-11-03 15:53:36.279970598 +0800
@@ -0,0 +1,260 @@
+/*******************************************************************************
+
+ Please read this before change message type
+ 1. Do _NOT_ use any compile flag here.
+ 2. The messages are grouped by module. Please find your module to add
+ new message. If not found, then just create new module.
+ 3. Each module can define 1000 messages.
+ 4. Message attribute is reserved in the first 8 bits, i.e., 0xFF00 0000.
+ 5. Message naming rule: ZCFG_MSG_<MODULE NAME>_<MSG TYPE>
+ ex, ZCFG_MSG_WAN_CONNCTION_READY, where 'WAN' is the module name and
+ 'CONNCTION_READY' is the message type.
+ 6. Message numbering rule: find a unique number in your module.
+ 7. put comment at the tail of line.
+
+ !!! Please keep texts aligned and nice look !!!
+
+*******************************************************************************/
+#ifndef _ZCFG_MSG_TYPE_H_
+#define _ZCFG_MSG_TYPE_H_
+
+/*******************************************************************************
+
+ Message attribute
+
+*******************************************************************************/
+#define ZCFG_NO_WAIT_REPLY (1 << 31)
+#define ZCFG_BLOCK_MODE_CONFIG_APPLY (1 << 30)
+#define ZCFG_PARTIAL_OBJECT_SET (1 << 29)
+
+/*******************************************************************************
+
+ Messgae type
+
+*******************************************************************************/
+
+/*------------------------------------------------------------------------------
+
+ General
+ range : 0 - 999
+ prefix : REQUEST_
+ RESPONSE_
+ ZCFG_MSG_<ACTION>_
+
+------------------------------------------------------------------------------*/
+#define REQUEST_GET_NEXT_OBJ 1
+#define REQUEST_GET_OBJ 2
+#define REQUEST_SET_OBJ 3
+#define REQUEST_SET_MULTI_OBJ 4
+#define REQUEST_ADD_INSTANCE 5
+#define REQUEST_DEL_INSTANCE 6
+#define REQUEST_FIRMWARE_UPGRADE 7
+#define REQUEST_RESTORE_DEFAULT 8
+#define REQUEST_GET_NEXT_SUB 9
+#define REQUEST_GET_PARAM_ATTR 10
+#define REQUEST_SET_PARAM_ATTR 11
+#define REQUEST_SET_WITHOUT_APPLY 12
+#define REQUEST_ROMD_UPGRADE 13
+#define REQUEST_GET_OBJ_WITHOUT_UPDATE 14
+#define REQUEST_CONFIG_BACKUP 15
+#define REQUEST_GET_NEXT_OBJ_WITHOUT_UPDATE 16
+#define REQUEST_GET_NEXT_SUB_WITHOUT_UPDATE 17
+#define REQUEST_REINIT_MACLESS_PROVISIONING 18
+#define REQUEST_FIRMWARE_UPGRADE_CHK 19
+#define REQUEST_RESTORE_DEFAULT_CHK 20
+#define REQUEST_FIRMWARE_WRITE_ONLY 21
+#define REQUEST_GET_WHOLE_OBJ_BY_NAME 22
+#define REQUEST_SET_WHOLE_OBJ_BY_NAME 23
+
+#define RESPONSE_GET_SUCCESS (100 | ZCFG_NO_WAIT_REPLY)
+#define RESPONSE_GET_EMPTY (101 | ZCFG_NO_WAIT_REPLY)
+#define RESPONSE_GET_FAIL (102 | ZCFG_NO_WAIT_REPLY)
+#define RESPONSE_SUCCESS (103 | ZCFG_NO_WAIT_REPLY)
+#define RESPONSE_FAIL (104 | ZCFG_NO_WAIT_REPLY)
+#define RESPONSE_WRITE_OBJ_SUCCESS (105 | ZCFG_NO_WAIT_REPLY)
+#define RESPONSE_WRITE_OBJ_FAIL (106 | ZCFG_NO_WAIT_REPLY)
+#define RESPONSE_NO_MORE_INSTANCE (107 | ZCFG_NO_WAIT_REPLY)
+
+#define ZCFG_MSG_DELAY_APPLY 200
+#define ZCFG_MSG_RE_APPLY 201
+#define ZCFG_MSG_UPNP_PORTMAP_GET 202
+#define ZCFG_MSG_GET_TR98_ALL_IGD_NAMES 203
+#define ZCFG_MSG_MCPCTL 204
+#define ZCFG_MSG_CLEAN_ROMD 205
+#define ZCFG_MSG_SAVE_ROMD 206
+#define ZCFG_MSG_FAKEROOT_COMMAND (207 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_FAKEROOT_SYS_ATSH 208 /* Fakeroot for "sys atsh" */
+#define ZCFG_MSG_WIFI_WEB_REDIRECT_CHECK (209 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PPP_AUTH_FAIL (210 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_REQ_REBOOT (211 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_REQ_SYNCFLASH (212 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PPP_LCP_ECHO_GET 213
+#define ZCFG_MSG_DHCP_OPTIONI125_CHK 214
+#define ZCFG_MSG_LAN_IP_CONNECTION_UP (215 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DHCPC_BOUND (216 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DHCPC_DECONFIG (217 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DHCPC_RELEASE (218 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DHCP6C_STATE_CHANGED (219 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_MGABDEV_DETECT (220 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_RA_INFO (221 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_MGMT_NAT_DETECT (222 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_MGMT_NAT_CLEAR (223 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_MGMT_UDP_CONNREQ (224 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_MGMT_DIAGNOSTIC_COMPLETE (225 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_NSLOOKUP_MSG (226 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_ATM_OAM_F5_COMPLETE (227 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_ATM_OAM_F4_COMPLETE (228 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VC_AUTOHUNT_START (229 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VC_AUTOHUNT_STOP (230 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_HTTP_TIMEOUT_CONFIG (231 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_NTP_SYNC_SUCCESS (232 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_STB_VENDOR_ID_FIND (233 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_AUTO_PROVISION (234 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_INIT_DATAMODEL_FIN (235 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VLAN_AUTOHUNT_START (236 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VLAN_AUTOHUNT_STOP (237 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VLAN_HUNT_SUCCESS (238 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VLAN_HUNT_FAIL (239 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VLAN_HUNT_SET_TIMEOUT (240 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_MGMT_CONNECT_UPDATE (241 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DOWNLOAD_DIAG_COMPLETE_EVENT (242 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_TR64_LAN_DEVICE_UPDATE (243 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DHCPC_RENEW (245 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_AUTOHUNT_FINISH (246 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_ETHWAN_TR69_PROVISION_SUCCESS (247 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VLAN_HUNT_TERMINATE (248 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_AUTO_RSV_IP (249 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPLOAD_DIAG_COMPLETE_EVENT (250 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DHCPD_OPTION (251 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_SIP_WAN_CHK (252 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_CLEAN_ROMD_NO_REPLY (253 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_SAVE_ROMD_NO_REPLY (254 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_ON (255 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_OFF (256 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_ON (257 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_OFF (258 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PROXIMITY_SENSOR_ON (259 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PROXIMITY_SENSOR_OFF (260 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_ZYAUTOPROVISION (261 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_POWER_MGMT_LED_ON (262 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_POWER_MGMT_LED_OFF (263 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_REQ_SWITCH_BOOT_PARTITION 264
+#define ZCFG_MSG_RESET_ACCOUNT_DEFAULT (265 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PINGSVRS_RST (266 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_MAIL_SEND_EVENT (267 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DHCP6S_STATE (268 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_REPLY 269
+#define ZCFG_MSG_HELLO 270
+#define ZCFG_MSG_NO_REPLY (271 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PPPD_EVENT (272 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PARAMETER_CHANGED_NOTIFY (273 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_LAN_MAC_CONTROL_EVENT (274 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_INIT_WAN_LINK_INFO (275 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_REBOOT_SYSTEM (276 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PING_MSG (277 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_TRACERT_MSG (278 | ZCFG_NO_WAIT_REPLY)
+
+/*------------------------------------------------------------------------------
+
+ WAN
+ range : 1000 - 1999
+ prefix : ZCFG_MSG_WAN_
+
+------------------------------------------------------------------------------*/
+#define ZCFG_MSG_WAN_CONNCTION_READY 1000
+#define ZCFG_MSG_WAN_CONNCTION_LOST 1001
+#define ZCFG_MSG_WAN_PPP_DISCONNECT 1002
+#define ZCFG_MSG_WAN_PPP_CONNECT 1003
+#define ZCFG_MSG_WAN_IP_RELEASE 1004
+#define ZCFG_MSG_WAN_IP_RENEW 1005
+#define ZCFG_MSG_WAN_IP_CONNECTION_UP (1006 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_LINK_STATUS (1007 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_PPP_CONNECTION_UP (1009 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_CONNECTION_READY (1010 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_CONNECTION_LOST (1011 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_PPP_DISCONNECTED (1012 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_PPP_CONNECTING (1013 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WAN_INTERNET_LED_UPDATE (1014 | ZCFG_NO_WAIT_REPLY)
+
+/*------------------------------------------------------------------------------
+
+ VOIP
+ range : 2000 - 2999
+ prefix : ZCFG_MSG_VOICE_
+
+------------------------------------------------------------------------------*/
+#define ZCFG_MSG_VOICE_CONTROL 2000
+#define ZCFG_MSG_VOICE_DEBUG_AND_TEST 2001
+#define ZCFG_MSG_VOICE_STATS_GET 2002
+#define ZCFG_MSG_VOICE_LIST_ACCESS 2003
+#define ZCFG_MSG_VOICE_CAP_GET 2004
+#define ZCFG_MSG_VOICE_CONNECTION_CHANGE (2005 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VOICE_CONNECTION_LOST (2006 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VOICE_DYNAMIC_INSTANCE_CHANGED (2007 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VOICE_STATIC_CONFIG_CHANGED (2008 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VOICE_CONFIG_SAVED (2009 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_VOICE_CONFIG_CHANGED_PARTIAL_RELOAD (2010 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_DECT_CONTROL 2011
+#define ZCFG_MSG_DECT_STATS_GET 2012
+
+/*------------------------------------------------------------------------------
+
+ TR-069
+ range : 3000 - 3999
+ prefix : ZCFG_MSG_TR069_
+
+------------------------------------------------------------------------------*/
+#define ZCFG_MSG_REQUEST_TR98_OBJMAPPING 3000
+#define ZCFG_MSG_REQUEST_TR181_OBJMAPPING 3001
+#define ZCFG_MSG_NOTIFY_TR69_TR98 (3002 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_ADD_TR98_MAPPING 3003
+#define ZCFG_MSG_UPDATE_PARAMETER_NOTIFY (3004 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_HOSTS 3005
+#define ZCFG_MSG_REQUEST_DELAY_DELETE 3006
+#define ZCFG_MSG_UPGRADING_FW_CHECK_FWID_STATUS 3007
+#define ZCFG_MSG_UPGRADING_FW_CHECK_MODEL_STATUS 3008
+#define ZCFG_MSG_REQUEST_GET_PARAM_ATTR_LIST 3009
+#define REQUEST_QUERY_OBJ_PARAM_ATTR 3010
+#define REQUEST_QUERY_OBJ_EXIST 3011
+#define ZCFG_MSG_LOG_SETTING_CONFIG (3012 | ZCFG_NO_WAIT_REPLY)
+#define REQUEST_QUERY_TR98_OBJ_INSTANCE_ARRAY 3013
+#define REQUEST_QUERY_TR181_OBJ_INSTANCE_ARRAY 3014
+#define ZCFG_MSG_REQUEST_TR98_MAPPING 3015 /* Request for tr181 object name related with tr98 */
+#define ZCFG_MSG_REQUEST_TR181_MAPPING 3016 /* Request for tr98 object name related with tr181 */
+#define ZCFG_MSG_TR64_DEVICE_UPDATE (3017 | ZCFG_NO_WAIT_REPLY)
+
+/*------------------------------------------------------------------------------
+
+ WIFI
+ range : 4000 - 4999
+ prefix : ZCFG_MSG_WIFI_
+
+------------------------------------------------------------------------------*/
+#define ZCFG_MSG_WIFI_INIT (4000 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WIFI_RELOAD (4001 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WIFI_UPDATE_LANINFO (4002 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WIFI_GET_LIST 4003
+#define ZCFG_MSG_WPS_RELOAD (4004 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WPS_HWBTN_PRESS 4005
+#define ZCFG_MSG_WPS_SWBTN_PRESS 4006
+#define ZCFG_MSG_WPS_START_STAPIN 4007
+#define ZCFG_MSG_WDS_SCAN 4008
+#define ZCFG_MSG_WIFI_STA_FILTER (4009 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_CHANNEL_SCAN 4010
+#define ZCFG_MSG_GET_CHANNEL_INFO 4011
+#define ZCFG_MSG_WIFI_ST_UPDATE 4012
+#define ZCFG_MSG_WIFI_RELOAD_CHECK 4013
+#define ZCFG_MSG_WIFI_LED_ENABLE (4014 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_WPS_ACTION_CANCEL 4015
+#define ZCFG_MSG_WPS_UPDATE_CONFIG 4016
+#define ZCFG_MSG_WLAN_GET_CMD 4017
+#define ZCFG_MSG_WLAN_SET_CMD 4018
+#define ZCFG_MSG_WIFI_RELOAD_DELAY (4019 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_BSA_STA_FILTER (4020 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_ENABLE_SONiQ (4021 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PRESET_SSID_EN (4022 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_PRESET_SSID_DIS (4023 | ZCFG_NO_WAIT_REPLY)
+#define ZCFG_MSG_UPDATE_ONE_CONNECT (4024 | ZCFG_NO_WAIT_REPLY)
+
+//==============================================================================
+#endif // _ZCFG_MSG_TYPE_H_
package/public-zyxel/libzcfg_msg/patches/118-ZYXEL_BUGFIX_add_SipAccountId_to_voice_msg_JakeChang.patch
+38
View File
@@ -0,0 +1,38 @@
Index: libzcfg_msg-1.0/zcfg_msg_voice.h
===================================================================
--- libzcfg_msg-1.0.orig/zcfg_msg_voice.h 2017-10-31 17:11:30.564473211 +0800
+++ libzcfg_msg-1.0/zcfg_msg_voice.h 2017-11-02 14:24:53.746533013 +0800
@@ -70,14 +70,19 @@
#define VOICE_STATS_REQ_ONGOING_CALL_CNT (1 << 5)
#define VOICE_STATS_REQ_VOICE_LINE_STATS (1 << 6)
#define VOICE_STATS_REQ_SIP_LINE_CALL_STATE (1 << 7) //Amber.20170901: Add for support SIP Line CallState info Retrieve via TR069
+#define VOICE_STATS_REQ_SIP_ACCT_MAX VOICE_SIP_ACCT_MAX
//======
typedef struct voiceStatsReq_s {
- uint16_t bitFlag;
+ uint16_t bitFlag;
+
+ uint16_t registerStatus; //bitmap: each bit (from the LSB) is corresponding to one SIP account/line. Markup dedicated bit to indicate requesting its corresponding SIP account/line's SIP Registration Status. This is designed to support 16 SIP accounts/lines - SIP-00 ~ SIP-15.
+ uint16_t mwiStatus; //bitmap: each bit (from the LSB) is corresponding to one SIP account/line. Markup dedicated bit to indicate requesting its corresponding SIP account/line's MWI Status. This is designed to support 16 SIP accounts/lines - SIP-00 ~ SIP-15.
+ //uint16_t callState; //bitmap: each bit (from the LSB) is corresponding to one Call. Markup dedicated bit to indicate requesting its corresponding Call's Operation State. This is designed to support 10 Concurrent Calls - SIP-00 ~ SIP-09.
+ uint8_t fxsHookState; //bitmap: each bit (from the LSB) is corresponding to one FXS phone port. Markup dedicated bit to indicate requesting its corresponding FXS phone port's Hood State. This is designed to support 8 FXS phone ports - FXS-00 ~ FXS-07.
+
+ uint16_t sipLineStats; //SIP Acct Id (NOTE: NOT a bitmap), which you expect to request its corresponding (All) Call(s') Statistics Data (Stats) Info. This is designed to support ONLY One Single SIP accounts/lines.
+ uint16_t sipLineCallState; //SIP Acct Id (NOTE: NOT a bitmap), which you expect to request its (All) corresponding Call(s') Operation State Info. This is designed to support ONLY One Single SIP accounts/lines.
- uint16_t registerStatus; //bitmap: each bit (from the LSB) is corresponding to one SIP account/line. Markup dedicated bit to indicate requesting its corresponding SIP account/line's SIP Registration Status. This is designed to support 16 SIP accounts/lines - SIP-00 ~ SIP-15.
- uint16_t mwiStatus; //bitmap: each bit (from the LSB) is corresponding to one SIP account/line. Markup dedicated bit to indicate requesting its corresponding SIP account/line's MWI Status. This is designed to support 16 SIP accounts/lines - SIP-00 ~ SIP-15.
- uint16_t callState; //bitmap: each bit (from the LSB) is corresponding to one Call. Markup dedicated bit to indicate requesting its corresponding Call's Operation State. This is designed to support 10 Concurrent Calls - SIP-00 ~ SIP-09.
- uint8_t fxsHookState; //bitmap: each bit (from the LSB) is corresponding to one FXS phone port. Markup dedicated bit to indicate requesting its corresponding FXS phone port's Hood State. This is designed to support 8 FXS phone ports - FXS-00 ~ FXS-07.
} voiceStatsReq_t;
@@ -265,6 +270,8 @@
char cmdLine[200];
#endif //ZYXEL_ZYIMS_CMD_TEST.
+ uint16_t sipLineStats; //SIP Acct Id (NOTE: NOT a bitmap), which you expect to request its corresponding (All) Call(s') Statistics Data (Stats) Info. This is designed to support ONLY One Single SIP accounts/lines.
+
bool resetLineStats;
} voiceCtrlReq_t;

Some files were not shown because too many files have changed in this diff Show More