lnk/microser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

自主协议库编译通过

Browse Source
This commit is contained in:
lnk
2026-06-15 15:48:16 +08:00
parent d3579a2aa7
commit 7205cb5cb9
621 changed files with 224958 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mms/mms_process.c
View File

@@ -202,7 +202,7 @@ void closeChannel(chnl_usr_t *chnl_usr)
mvl_free_req_ctrl(chnl_usr->m_reqCtrl);
chnl_usr->net_info->user_ext = NULL;
chnl_usr->net_info->user_info = NULL;
chnl_usr->net_info = NULL;
@@ -229,7 +229,7 @@ ST_VOID Callback_channel_disconnect_ind(MVL_NET_INFO * NetInfo, ST_INT discType)
{
chnl_usr_t *chnl_usr;
chnl_usr = (chnl_usr_t*)NetInfo->user_ext;
chnl_usr = (chnl_usr_t*)NetInfo->user_info;
if ( chnl_usr ) {
if(chnl_usr->m_state == CHANNEL_CONNECTING)
@@ -248,7 +248,7 @@ ST_VOID Callback_channel_disconnect_ind(MVL_NET_INFO * NetInfo, ST_INT discType)
chnl_usr->net_info = NULL;
NetInfo->user_ext = NULL;
NetInfo->user_info = NULL;
}
printf(" Callback_channel_disconnect_ind ,NetInfo = %x",NetInfo);
@@ -1703,7 +1703,7 @@ void CheckNextNotConnectedChannel()
chnl_usr->m_reqCtrl = NULL;
chnl_usr->m_state = CHANNEL_CONNECTED;
chnl_usr->net_info->user_ext = chnl_usr;
chnl_usr->net_info->user_info = chnl_usr;
all_rcb_info = (ALL_RCB_INFO *)chk_calloc(1, sizeof (ALL_RCB_INFO));
all_rcb_info->rpt_typeids = &g_rpt_typeids;
@@ -1863,7 +1863,7 @@ void CheckNextNotConnectedChannel()
echo_warn3( "CHANNEL_DISCONNECTING done %s:%d,NetInfo= %x ",chnl_usr->ip_str,chnl_usr->chnl->port,chnl_usr->net_info);
mvl_free_req_ctrl(chnl_usr->m_reqCtrl);
if(chnl_usr->net_info)
chnl_usr->net_info->user_ext = NULL;
chnl_usr->net_info->user_info = NULL;
chnl_usr->m_reqCtrl = NULL;
chnl_usr->net_info = NULL;
@@ -1891,7 +1891,7 @@ void CheckNextNotConnectedChannel()
echo_warn2( "CHANNEL_DISCONNECTING reqCtrl->done未完成,but time over 180 secs, close channel IP %s,NetInfo= %x ",chnl_usr->ip_str,chnl_usr->net_info);
mvl_free_req_ctrl(chnl_usr->m_reqCtrl);
chnl_usr->net_info->user_ext = NULL;
chnl_usr->net_info->user_info = NULL;
mms_release_connection(chnl_usr->net_info);
chnl_usr->net_info->rem_vmd = NULL;

4
mms/mmscli_rpt.c
View File

@@ -844,7 +844,7 @@ ST_VOID u_iec_rpt_ind_data_by_devtype(MVL_VAR_ASSOC** info_va,
rptinfo = find_rptinfo_from_net_rpt_info_name(net_info, rcb_info);
//rptinfo->m_LastDataTime = sGetMsTime();//WW 2023-08-29 去除
LD_info = rptinfo->LD_info;
chnl_usr = net_info->user_ext;
chnl_usr = net_info->user_info;
ied = chnl_usr->chnl->ied;
not_set_rpt_TimeID_this = TRUE;
@@ -1230,7 +1230,7 @@ ST_VOID u_iec_rpt_ind_data(MVL_VAR_ASSOC** info_va,
rptinfo = find_rptinfo_from_net_rcb_info(net_info, rcb_info);
//rptinfo->m_LastDataTime = sGetMsTime();//WW 2023-08-29 去除
LD_info = rptinfo->LD_info;
chnl_usr = net_info->user_ext;
chnl_usr = net_info->user_info;
ied = chnl_usr->chnl->ied;
not_set_rpt_TimeID_this = TRUE;

12
mms/mmsop_en.c
View File

@@ -2451,16 +2451,16 @@ ST_INT m_cl_max_enrollment_summary;
#if (MMS_LOAD_DOM_EN & RESP_EN)
ST_INT m_sv_max_loadd_cap;
#endif
#if (MMS_READ_EN & RESP_EN)
//lnk编译，客户端不受影响
//#if (MMS_READ_EN & RESP_EN)
ST_INT m_sv_max_read_var_spec;
#endif
//#endif
#if (MMS_WRITE_EN & RESP_EN)
//#if (MMS_WRITE_EN & RESP_EN)
ST_INT m_sv_max_write_var_spec;
ST_INT m_sv_max_write_data;
#endif
//#endif
//lnk编译，客户端不受影响
#if (MMS_RDDWN_EN & RESP_EN)
ST_INT m_sv_max_rqdlnl_cap;
#endif

6
mms/rdb_ext_utils.c
View File

@@ -139,7 +139,7 @@ RCB_INFO* FindRcbInfo(MVL_NET_INFO *net_info,ST_CHAR *dom_name, ST_CHAR *rcb_nam
int cpuno,rpt_no;
char rpt_inst_name[65];
chnl_usr = net_info->user_ext;
chnl_usr = net_info->user_info;
ied = chnl_usr->chnl->ied;
ied_usr = GET_IEDEXT_ADDR(ied);
@@ -188,7 +188,7 @@ rptinfo_t* find_rptinfo_from_net_rpt_info_name(MVL_NET_INFO *net_info, RCB_INFO
rptinfo_t *rptinfo = NULL;
int cpuno,rpt_no;
chnl_usr = net_info->user_ext;
chnl_usr = net_info->user_info;
ied = chnl_usr->chnl->ied;
ied_usr = GET_IEDEXT_ADDR(ied);
@@ -232,7 +232,7 @@ rptinfo_t* find_rptinfo_from_net_rcb_info(MVL_NET_INFO *net_info,RCB_INFO *rcb_i
rptinfo_t *rptinfo = NULL;
int cpuno,rpt_no;
chnl_usr = net_info->user_ext;
chnl_usr = net_info->user_info;
ied = chnl_usr->chnl->ied;
ied_usr = GET_IEDEXT_ADDR(ied);