diff --git a/include/inc/mvl_defs.h b/include/inc/mvl_defs.h index 3c047f5..4c10a08 100644 --- a/include/inc/mvl_defs.h +++ b/include/inc/mvl_defs.h @@ -457,6 +457,7 @@ typedef struct mvl_net_info ST_VOID *user_info; /* MVL user can use this for 'whatever' */ MVL_NET_FILE *file_list; /* linked list of open files on this conn*/ + ST_VOID *user_ext; /* user can use this for 'whatever', add by Lzm */ } MVL_NET_INFO; /* Our connection control structures */ diff --git a/mms/mms_process.c b/mms/mms_process.c index e5474ab..e8975ef 100644 --- a/mms/mms_process.c +++ b/mms/mms_process.c @@ -197,32 +197,14 @@ void closeChannel(chnl_usr_t *chnl_usr) ALL_RCB_INFO *all_rcb_info; RCB_INFO *rcb_info; ST_RET ret; - //lnk20260617防止复用崩溃 - /*if(chnl_usr->net_info->user_info) - { + if(chnl_usr->net_info->user_info) + { all_rcb_info = (ALL_RCB_INFO *)chnl_usr->net_info->user_info; - all_rcb_info = chnl_usr->all_rcb_info; - while((rcb_info = (RCB_INFO *)list_get_first(&all_rcb_info->rcb_info_list)) != NULL) rcb_info_destroy (rcb_info); chk_free(all_rcb_info); chnl_usr->net_info->user_info=NULL; - }*/ - if (chnl_usr->all_rcb_info) - { - all_rcb_info = chnl_usr->all_rcb_info; - - while ((rcb_info = (RCB_INFO *)list_get_first(&all_rcb_info->rcb_info_list)) != NULL) { - rcb_info_destroy(rcb_info); - } - - chk_free(all_rcb_info); - chnl_usr->all_rcb_info = NULL; } - - chnl_usr->net_info->user_info = NULL; - - //lnk20260617防止复用崩溃 chnl_usr->net_info->rem_vmd = NULL; echo_warn("---------start disconnectFromServer!\n"); ret = mms_disconnectFromServer(chnl_usr->net_info,&chnl_usr->m_reqCtrl); @@ -237,10 +219,7 @@ void closeChannel(chnl_usr_t *chnl_usr) mvl_free_req_ctrl(chnl_usr->m_reqCtrl); - //lnk20260617防止复用崩溃 - chnl_usr->all_rcb_info = NULL; - - chnl_usr->net_info->user_info = NULL; + chnl_usr->net_info->user_ext = NULL; chnl_usr->net_info = NULL; @@ -267,7 +246,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_info; + chnl_usr = (chnl_usr_t*)NetInfo->user_ext; if ( chnl_usr ) { if(chnl_usr->m_state == CHANNEL_CONNECTING) @@ -286,7 +265,7 @@ ST_VOID Callback_channel_disconnect_ind(MVL_NET_INFO * NetInfo, ST_INT discType) chnl_usr->net_info = NULL; - NetInfo->user_info = NULL; + NetInfo->user_ext = NULL; } printf(" Callback_channel_disconnect_ind ,NetInfo = %x",NetInfo); @@ -1741,7 +1720,7 @@ void CheckNextNotConnectedChannel() chnl_usr->m_reqCtrl = NULL; chnl_usr->m_state = CHANNEL_CONNECTED; - chnl_usr->net_info->user_info = chnl_usr; + chnl_usr->net_info->user_ext = chnl_usr; all_rcb_info = (ALL_RCB_INFO *)chk_calloc(1, sizeof (ALL_RCB_INFO)); all_rcb_info->rpt_typeids = &g_rpt_typeids; @@ -1750,9 +1729,7 @@ void CheckNextNotConnectedChannel() echo_warn("chnl_usr->net_info->user_info is not NULL\n"); } - //lnk20260617防止复用崩溃 - //chnl_usr->net_info->user_info = all_rcb_info; - + chnl_usr->net_info->user_info = all_rcb_info; chnl_usr->chnl->ied->status = STATUS_NORMAL; chnl_usr->chnl->status = STATUS_NORMAL; @@ -1903,7 +1880,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_info = NULL; + chnl_usr->net_info->user_ext = NULL; chnl_usr->m_reqCtrl = NULL; chnl_usr->net_info = NULL; @@ -1931,7 +1908,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_info = NULL; + chnl_usr->net_info->user_ext = NULL; mms_release_connection(chnl_usr->net_info); chnl_usr->net_info->rem_vmd = NULL; diff --git a/mms/mmscli_rpt.c b/mms/mmscli_rpt.c index d19edf9..0be6095 100644 --- a/mms/mmscli_rpt.c +++ b/mms/mmscli_rpt.c @@ -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_info; + chnl_usr = net_info->user_ext; ied = chnl_usr->chnl->ied; not_set_rpt_TimeID_this = TRUE; @@ -1228,31 +1228,9 @@ ST_VOID u_iec_rpt_ind_data(MVL_VAR_ASSOC** info_va, log_var_data(info_va[va_num], &mms_dec_data); //assert(add_mms_dec_data== (uint32_t)&mms_dec_data); rptinfo = find_rptinfo_from_net_rcb_info(net_info, rcb_info); - - if (rptinfo == NULL) { - chnl_usr_t* chnl_usr_tmp = net_info ? (chnl_usr_t*)net_info->user_info : NULL; - - printf("[RPT][ERROR] cannot find rptinfo, net_info=%p user_info=%p rcb_info=%p RptID=%s\n", - (void*)net_info, - net_info ? (void*)net_info->user_info : NULL, - (void*)rcb_info, - (rcb_info && rcb_info->RptID) ? rcb_info->RptID : "NULL"); - - return; - } - - //rptinfo->m_LastDataTime = sGetMsTime();//WW 2023-08-29 去除 LD_info = rptinfo->LD_info; - - if (LD_info == NULL) { - printf("[RPT][ERROR] rptinfo->LD_info NULL, rptinfo=%p RptID=%s\n", - (void*)rptinfo, - (rcb_info && rcb_info->RptID) ? rcb_info->RptID : "NULL"); - return; - } - - chnl_usr = net_info->user_info; + chnl_usr = net_info->user_ext; ied = chnl_usr->chnl->ied; not_set_rpt_TimeID_this = TRUE; @@ -2031,13 +2009,7 @@ ST_RET u_iec_rpt_ind(MVL_COMM_EVENT* event) } /* Get "all_rcb_info" from "user_info". User must set "user_info" when conn established.*/ - //lnk20260617防止复用崩溃 - //all_rcb_info = (ALL_RCB_INFO*)event->net_info->user_info; - chnl_usr_t *chnl_usr = (chnl_usr_t*)event->net_info->user_info; - if (chnl_usr == NULL || chnl_usr->all_rcb_info == NULL) { - return; - } - all_rcb_info = chnl_usr->all_rcb_info; + all_rcb_info = (ALL_RCB_INFO*)event->net_info->user_info; /* Check "all_rcb_info" to see if any RCB has been enabled. */ if (all_rcb_info == NULL || all_rcb_info->rcb_info_list == NULL) diff --git a/mms/mmsclient.c b/mms/mmsclient.c index 29cb62a..c037f29 100644 --- a/mms/mmsclient.c +++ b/mms/mmsclient.c @@ -860,24 +860,8 @@ ST_UCHAR TrgOps [1]; /* 8 bit bitstring */ if(ret == SD_SUCCESS) { - //lnk20260617防止复用崩溃 - //list_add_last(&((ALL_RCB_INFO *)clientNetInfo->user_info)->rcb_info_list, rcb_info); /* add RCB to list*/ - chnl_usr_t *chnl_usr = (chnl_usr_t *)clientNetInfo->user_info; - - if (chnl_usr == NULL || chnl_usr->all_rcb_info == NULL) { - printf("[RPT_REGISTER][ERROR] invalid user_info=%p all_rcb_info=%p dom=%s rcb=%s\n", - clientNetInfo ? clientNetInfo->user_info : NULL, - chnl_usr ? chnl_usr->all_rcb_info : NULL, - dom_name ? dom_name : "NULL", - rcb_name ? rcb_name : "NULL"); - - rcb_info_destroy(rcb_info); - rcb_info = NULL; - return NULL; - } - - list_add_last(&chnl_usr->all_rcb_info->rcb_info_list, rcb_info); - } + list_add_last(&((ALL_RCB_INFO *)clientNetInfo->user_info)->rcb_info_list, rcb_info); /* add RCB to list*/ + } else{ rcb_info_destroy(rcb_info); rcb_info = NULL; diff --git a/mms/rdb_client.h b/mms/rdb_client.h index 2cdce45..60b1cd5 100644 --- a/mms/rdb_client.h +++ b/mms/rdb_client.h @@ -375,8 +375,6 @@ struct chnl_usr_t{ double m_ClosedMsTime; //上次通道关闭时间 double m_LastPosRespTime; //上次肯定响应的时间 int m_NegRespTimes; // 累计否定响应次数 - - ALL_RCB_INFO *all_rcb_info;//lnk20260617防止复用崩溃 }; diff --git a/mms/rdb_ext_utils.c b/mms/rdb_ext_utils.c index 4969cc7..3b9fff4 100644 --- a/mms/rdb_ext_utils.c +++ b/mms/rdb_ext_utils.c @@ -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_info; + chnl_usr = net_info->user_ext; 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_info; + chnl_usr = net_info->user_ext; ied = chnl_usr->chnl->ied; ied_usr = GET_IEDEXT_ADDR(ied); @@ -232,20 +232,9 @@ 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; - if (net_info == NULL || rcb_info == NULL) { - return NULL; - } - - chnl_usr = (chnl_usr_t*)net_info->user_info; - if (chnl_usr == NULL || chnl_usr->chnl == NULL || chnl_usr->chnl->ied == NULL) { - return NULL; - } - + chnl_usr = net_info->user_ext; ied = chnl_usr->chnl->ied; ied_usr = GET_IEDEXT_ADDR(ied); - if (ied_usr == NULL || ied_usr->LD_info == NULL) { - return NULL; - } for(cpuno=0 ; cpunocpucount; cpuno++) { LD_info = &(ied_usr->LD_info[cpuno]); diff --git a/mmslib/Makefile.Debug b/mmslib/Makefile.Debug index fa53bd5..1ce9a29 100644 --- a/mmslib/Makefile.Debug +++ b/mmslib/Makefile.Debug @@ -800,7 +800,7 @@ qmake: FORCE dist: @$(CHK_DIR_EXISTS) debug/mmslibd1.0.0 || $(MKDIR) debug/mmslibd1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/mmslibd1.0.0/ && $(COPY_FILE) --parents mmslib.h inc/tp4api.h inc/tp4_log.h inc/tp4_encd.h inc/tp4.h inc/tp0_sock.h inc/time_str.h inc/sysincs.h inc/sx_log.h inc/sx_defs.h inc/sx_arb.h inc/STR_UTIL.H inc/stime.h inc/stdtime_w32.h inc/stdtime_tzrules.h inc/stdtime_timezone_csv.h inc/stdtime_stdint.h inc/stdtime_quadlib.h inc/stdtime_mms_utctime.h inc/stdtime_mms_btime.h inc/stdtime_enum_func.h inc/stdtime_enum_err.h inc/stdtime_endian.h inc/stdtime_config.h inc/stdtime.h inc/ssleLog.h inc/ssec_int.h inc/ssec.h inc/sock_log.h inc/smpval.h inc/smp_usr.h inc/smp_log.h inc/smp.h inc/Smem.h inc/slog.h inc/scrndefs.h inc/scl.h inc/rs_defs.h inc/rs_a.h inc/qmem.h inc/osillc.h inc/ntddosi.h inc/mvl_uca.h inc/mvl_log.h inc/mvl_defs.h inc/mvl_acse.h inc/mmslusec.h inc/mmslog.h inc/mmsldefs.h inc/mmsintr2.h inc/mmsefun.h inc/mmsdefs.h inc/mms_vvar.h inc/mms_pvmd.h inc/mms_pvar.h inc/mms_psem.h inc/mms_pprg.h inc/mms_pocs.h inc/mms_pjou.h inc/mms_pfil.h inc/mms_pevn.h inc/mms_perr.h inc/mms_pdom.h inc/mms_pcon.h inc/mms_mp.h inc/mms_log.h inc/mms_err.h inc/mms_dfun.h inc/mms_def2.h inc/mloguser.h inc/memlog.h inc/mem_chk.h inc/llcioctl.h inc/llcio.h inc/lean_a.h inc/gvaldefs.h inc/gse_mgmt.h inc/Goose.h inc/glbtypes.h inc/glbsem.h inc/glbopt.h inc/glberror.h inc/gensock2.h inc/gen_list.h inc/fkeydefs.h inc/ExceptionReport.h inc/ethsub.h inc/ethertyp.h inc/dibmatch.h inc/cosp_usr.h inc/cosp_log.h inc/cosp.h inc/copp_usr.h inc/copp_log.h inc/copp.h inc/conpack.h inc/clnpport.h inc/clnp_usr.h inc/clnp_tnt.h inc/clnp_sta.h inc/clnp_sne.h inc/clnp_log.h inc/clnp_llc.h inc/clnp.h inc/checksum.h inc/cfglog.h inc/cfg_util.h inc/asn1r.h inc/asn1log.h inc/asn1defs.h inc/arg.h inc/adlc_usr.h inc/adlc_sts.h inc/adlc_sm.h inc/adlc_log.h inc/adlc_dsm.h inc/adlc.h inc/acseauth.h inc/acse2usr.h inc/acse2log.h inc/acse2.h inc/mmsop_en/mmsop_en.h debug/mmslibd1.0.0/ && $(COPY_FILE) --parents mmslib.cpp asn1/asn1r.c asn1/are_vstr.c asn1/are_utc.c asn1/are_time.c asn1/are_ostr.c asn1/are_objd.c asn1/are_int.c asn1/are_flt.c asn1/are_delm.c asn1/are_btod.c asn1/are_bstr.c asn1/are_bool.c asn1/ard_vstr.c asn1/ard_utc.c asn1/ard_time.c asn1/ard_strn.c asn1/ard_ostr.c asn1/ard_objd.c asn1/ard_int.c asn1/ard_idnt.c asn1/ard_flt.c asn1/ard_delm.c asn1/ard_btod.c asn1/ard_bstr.c asn1/ard_bool.c mem/mem_chks.c mmsl/rs_write.c mmsl/rs_ustat.c mmsl/rs_trige.c mmsl/rs_stat.c mmsl/rs_repee.c mmsl/rs_repec.c mmsl/rs_repea.c mmsl/rs_read.c mmsl/rs_namel.c mmsl/rs_init.c mmsl/rs_info.c mmsl/rs_ident.c mmsl/rs_getvl.c mmsl/rs_getva.c mmsl/rs_getty.c mmsl/rs_getpi.c mmsl/rs_getee.c mmsl/rs_getec.c mmsl/rs_getea.c mmsl/rs_getdo.c mmsl/rs_getcl.c mmsl/rs_evnot.c mmsl/rs_defee.c mmsl/rs_concl.c mmsl/rs_cancl.c mmsl/rs_ackev.c mmsl/rq_write.c mmsl/rq_ustat.c mmsl/rq_trige.c mmsl/rq_stat.c mmsl/rq_repee.c mmsl/rq_repec.c mmsl/rq_repea.c mmsl/rq_read.c mmsl/rq_namel.c mmsl/rq_init.c mmsl/rq_info.c mmsl/rq_ident.c mmsl/rq_getvl.c mmsl/rq_getva.c mmsl/rq_getty.c mmsl/rq_getpi.c mmsl/rq_getee.c mmsl/rq_getec.c mmsl/rq_getea.c mmsl/rq_getdo.c mmsl/rq_getcl.c mmsl/rq_evnot.c mmsl/rq_defee.c mmsl/rq_concl.c mmsl/rq_cancl.c mmsl/rq_ackev.c mmsl/msdataas.c mmsl/ms_tdef4.c mmsl/ms_tdef2.c mmsl/ms_tdef.c mmsl/ms_size.c mmsl/ms_ext.c mmsl/mmsstat.c mmsl/mmslvar.c mmsl/mmsl_fin.c mmsl/mmsinit.c mmsl/mmsdtext.c mmsl/mmsdec.c mmsl/mmsdatat.c mmsl/mmsdata.c mmsl/mmsconcl.c mmsl/mmscancl.c mmsl/mms_tdef.c mmsl/mms_rtaa.c mmsl/mms_rej.c mmsl/mms_err4.c mmsl/mms_err3.c mmsl/mms_err2.c mmsl/mms_err.c mmsl/mms_ced7.c mmsl/mms_ced6.c mmsl/mms_ced5.c mmsl/mms_ced4.c mmsl/mms_ced3.c mmsl/mms_ced.c mmsl/mms_aref.c mmsl/mms_alta.c mmsl/mms_adl.c mmsle/rs_uploa.c mmsle/rs_termu.c mmsle/rs_termd.c mmsle/rs_takec.c mmsle/rs_store.c mmsle/rs_stop.c mmsle/rs_start.c mmsle/rs_rssta.c mmsle/rs_rspoo.c mmsle/rs_rsent.c mmsle/rs_resum.c mmsle/rs_reset.c mmsle/rs_renam.c mmsle/rs_relct.c mmsle/rs_rdupl.c mmsle/rs_rddwn.c mmsle/rs_outpu.c mmsle/rs_obtfi.c mmsle/rs_loadd.c mmsle/rs_kill.c mmsle/rs_jwrit.c mmsle/rs_jstat.c mmsle/rs_jread.c mmsle/rs_jinit.c mmsle/rs_jdele.c mmsle/rs_jcrea.c mmsle/rs_input.c mmsle/rs_initu.c mmsle/rs_initd.c mmsle/rs_getsc.c mmsle/rs_getas.c mmsle/rs_getae.c mmsle/rs_frena.c mmsle/rs_fread.c mmsle/rs_fopen.c mmsle/rs_fdir.c mmsle/rs_fdele.c mmsle/rs_fclos.c mmsle/rs_downl.c mmsle/rs_delvl.c mmsle/rs_delva.c mmsle/rs_delty.c mmsle/rs_delse.c mmsle/rs_delpi.c mmsle/rs_delee.c mmsle/rs_delec.c mmsle/rs_delea.c mmsle/rs_deldo.c mmsle/rs_defvl.c mmsle/rs_defva.c mmsle/rs_defty.c mmsle/rs_defse.c mmsle/rs_defsc.c mmsle/rs_defec.c mmsle/rs_defea.c mmsle/rs_crepi.c mmsle/rs_altee.c mmsle/rs_altec.c mmsle/rq_uploa.c mmsle/rq_termu.c mmsle/rq_termd.c mmsle/rq_takec.c mmsle/rq_store.c mmsle/rq_stop.c mmsle/rq_start.c mmsle/rq_rssta.c mmsle/rq_rspoo.c mmsle/rq_rsent.c mmsle/rq_resum.c mmsle/rq_reset.c mmsle/rq_renam.c mmsle/rq_relct.c mmsle/rq_rdupl.c mmsle/rq_rddwn.c mmsle/rq_outpu.c mmsle/rq_obtfi.c mmsle/rq_loadd.c mmsle/rq_kill.c mmsle/rq_jwrit.c mmsle/rq_jstat.c mmsle/rq_jread.c mmsle/rq_jinit.c mmsle/rq_jdele.c mmsle/rq_jcrea.c mmsle/rq_input.c mmsle/rq_initu.c mmsle/rq_initd.c mmsle/rq_getsc.c mmsle/rq_getas.c mmsle/rq_getae.c mmsle/rq_frena.c mmsle/rq_fread.c mmsle/rq_fopen.c mmsle/rq_fdir.c mmsle/rq_fdele.c mmsle/rq_fclos.c mmsle/rq_downl.c mmsle/rq_delvl.c mmsle/rq_delva.c mmsle/rq_delty.c mmsle/rq_delse.c mmsle/rq_delpi.c mmsle/rq_delee.c mmsle/rq_delec.c mmsle/rq_delea.c mmsle/rq_deldo.c mmsle/rq_defvl.c mmsle/rq_defva.c mmsle/rq_defty.c mmsle/rq_defse.c mmsle/rq_defsc.c mmsle/rq_defec.c mmsle/rq_defea.c mmsle/rq_crepi.c mmsle/rq_altee.c mmsle/rq_altec.c mmsle/mms_ced2.c mmsle/mms_ced1.c mvlu/sclproc.c mvlu/s_write.c mvlu/s_status.c mvlu/s_read.c mvlu/s_obtfi.c mvlu/s_jstat.c mvlu/s_jread.c mvlu/s_jinit.c mvlu/s_info.c mvlu/s_ident.c mvlu/s_getvla.c mvlu/s_getvaa.c mvlu/s_getnam.c mvlu/s_getdom.c mvlu/s_getcl.c mvlu/s_fren.c mvlu/s_fread.c mvlu/s_fopen.c mvlu/s_fdir.c mvlu/s_fdel.c mvlu/s_fclose.c mvlu/s_delvl.c mvlu/s_defvl.c mvlu/s_concl.c mvlu/s_cancel.c mvlu/mvluleaf.c mvlu/mvlu_sbo.c mvlu/mvlu_rt.c mvlu/mvlu_rpt.c mvlu/mvl61850_rpt.c mvlu/mvl61850_ctl.c mvlu/mvl61850.c mvlu/mvl_var.c mvlu/mvl_uca.c mvlu/mvl_type.c mvlu/mvl_typ2.c mvlu/mvl_serv.c mvlu/mvl_send.c mvlu/mvl_objb.c mvlu/mvl_obj.c mvlu/mvl_ijou.c mvlu/mvl_dtyp.c mvlu/mvl_buf.c mvlu/c_write.c mvlu/c_status.c mvlu/c_read.c mvlu/c_obtfi.c mvlu/c_jstat.c mvlu/c_jread.c mvlu/c_jinit.c mvlu/c_info.c mvlu/c_ident.c mvlu/c_getvla.c mvlu/c_getvar.c mvlu/c_getnam.c mvlu/c_getdom.c mvlu/c_fren.c mvlu/c_fread.c mvlu/c_fopen.c mvlu/c_fget.c mvlu/c_fdir.c mvlu/c_fdel.c mvlu/c_fclose.c mvlu/c_delvl.c mvlu/c_defvl.c mvlu/c_concl.c ositcps/tpx_dec.c ositcps/tp4port.c ositcps/tp4_enc.c ositcps/tp0main.c ositcps/tp0callg.c ositcps/tp0calld.c ositcps/tp0_socks.c ositcps/tp0_dec.c ositcps/osicfgx.c ositcps/lean_var.c ositcps/lean_cfg.c ositcps/cospmain.c ositcps/cosp_enc.c ositcps/cosp_dec.c ositcps/coppdcpr.c ositcps/coppdcp.c ositcps/coppdaru.c ositcps/copp_enc.c ositcps/copp_dec.c ositcps/checksum.c ositcps/acse2var.c ositcps/acse2enc.c ositcps/acse2dib.c ositcps/acse2dec.c slog/slogmem.c slog/slogipcs.c slog/sloghex.c slog/slogfil.c slog/slog.c slog/qmem.c ssec0/ssecusr0.c util/time_str.c util/sx_enc.c util/sx_dec.c util/sx_data.c util/sx_axs4d.c util/str_util.c util/stime.c util/stdtime_w32.c util/stdtime_quadlib.c util/stdtime_mms_utctime.c util/stdtime_mms_btime.c util/stdtime.c util/sclstore.c util/sclparse.c util/scl_log.c util/glbsem_unix.c util/glbsem.c util/gensock2.c util/genlists.c util/cfg_util.c debug/mmslibd1.0.0/ && (cd `dirname debug/mmslibd1.0.0` && $(TAR) mmslibd1.0.0.tar mmslibd1.0.0 && $(COMPRESS) mmslibd1.0.0.tar) && $(MOVE) `dirname debug/mmslibd1.0.0`/mmslibd1.0.0.tar.gz . && $(DEL_FILE) -r debug/mmslibd1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/mmslibd1.0.0/ && $(COPY_FILE) --parents mmslib.h inc/tp4api.h inc/tp4_log.h inc/tp4_encd.h inc/tp4.h inc/tp0_sock.h inc/time_str.h inc/sysincs.h inc/sx_log.h inc/sx_defs.h inc/sx_arb.h inc/str_util.h inc/stime.h inc/stdtime_w32.h inc/stdtime_tzrules.h inc/stdtime_timezone_csv.h inc/stdtime_stdint.h inc/stdtime_quadlib.h inc/stdtime_mms_utctime.h inc/stdtime_mms_btime.h inc/stdtime_enum_func.h inc/stdtime_enum_err.h inc/stdtime_endian.h inc/stdtime_config.h inc/stdtime.h inc/sslelog.h inc/ssec_int.h inc/ssec.h inc/sock_log.h inc/smpval.h inc/smp_usr.h inc/smp_log.h inc/smp.h inc/smem.h inc/slog.h inc/scrndefs.h inc/scl.h inc/rs_defs.h inc/rs_a.h inc/qmem.h inc/osillc.h inc/ntddosi.h inc/mvl_uca.h inc/mvl_log.h inc/mvl_defs.h inc/mvl_acse.h inc/mmslusec.h inc/mmslog.h inc/mmsldefs.h inc/mmsintr2.h inc/mmsefun.h inc/mmsdefs.h inc/mms_vvar.h inc/mms_pvmd.h inc/mms_pvar.h inc/mms_psem.h inc/mms_pprg.h inc/mms_pocs.h inc/mms_pjou.h inc/mms_pfil.h inc/mms_pevn.h inc/mms_perr.h inc/mms_pdom.h inc/mms_pcon.h inc/mms_mp.h inc/mms_log.h inc/mms_err.h inc/mms_dfun.h inc/mms_def2.h inc/mloguser.h inc/memlog.h inc/mem_chk.h inc/llcioctl.h inc/llcio.h inc/lean_a.h inc/gvaldefs.h inc/gse_mgmt.h inc/Goose.h inc/glbtypes.h inc/glbsem.h inc/glbopt.h inc/glberror.h inc/gensock2.h inc/gen_list.h inc/fkeydefs.h inc/ExceptionReport.h inc/ethsub.h inc/ethertyp.h inc/dibmatch.h inc/cosp_usr.h inc/cosp_log.h inc/cosp.h inc/copp_usr.h inc/copp_log.h inc/copp.h inc/conpack.h inc/clnpport.h inc/clnp_usr.h inc/clnp_tnt.h inc/clnp_sta.h inc/clnp_sne.h inc/clnp_log.h inc/clnp_llc.h inc/clnp.h inc/checksum.h inc/cfglog.h inc/cfg_util.h inc/asn1r.h inc/asn1log.h inc/asn1defs.h inc/arg.h inc/adlc_usr.h inc/adlc_sts.h inc/adlc_sm.h inc/adlc_log.h inc/adlc_dsm.h inc/adlc.h inc/acseauth.h inc/acse2usr.h inc/acse2log.h inc/acse2.h inc/mmsop_en/mmsop_en.h debug/mmslibd1.0.0/ && $(COPY_FILE) --parents mmslib.cpp asn1/asn1r.c asn1/are_vstr.c asn1/are_utc.c asn1/are_time.c asn1/are_ostr.c asn1/are_objd.c asn1/are_int.c asn1/are_flt.c asn1/are_delm.c asn1/are_btod.c asn1/are_bstr.c asn1/are_bool.c asn1/ard_vstr.c asn1/ard_utc.c asn1/ard_time.c asn1/ard_strn.c asn1/ard_ostr.c asn1/ard_objd.c asn1/ard_int.c asn1/ard_idnt.c asn1/ard_flt.c asn1/ard_delm.c asn1/ard_btod.c asn1/ard_bstr.c asn1/ard_bool.c mem/mem_chks.c mmsl/rs_write.c mmsl/rs_ustat.c mmsl/rs_trige.c mmsl/rs_stat.c mmsl/rs_repee.c mmsl/rs_repec.c mmsl/rs_repea.c mmsl/rs_read.c mmsl/rs_namel.c mmsl/rs_init.c mmsl/rs_info.c mmsl/rs_ident.c mmsl/rs_getvl.c mmsl/rs_getva.c mmsl/rs_getty.c mmsl/rs_getpi.c mmsl/rs_getee.c mmsl/rs_getec.c mmsl/rs_getea.c mmsl/rs_getdo.c mmsl/rs_getcl.c mmsl/rs_evnot.c mmsl/rs_defee.c mmsl/rs_concl.c mmsl/rs_cancl.c mmsl/rs_ackev.c mmsl/rq_write.c mmsl/rq_ustat.c mmsl/rq_trige.c mmsl/rq_stat.c mmsl/rq_repee.c mmsl/rq_repec.c mmsl/rq_repea.c mmsl/rq_read.c mmsl/rq_namel.c mmsl/rq_init.c mmsl/rq_info.c mmsl/rq_ident.c mmsl/rq_getvl.c mmsl/rq_getva.c mmsl/rq_getty.c mmsl/rq_getpi.c mmsl/rq_getee.c mmsl/rq_getec.c mmsl/rq_getea.c mmsl/rq_getdo.c mmsl/rq_getcl.c mmsl/rq_evnot.c mmsl/rq_defee.c mmsl/rq_concl.c mmsl/rq_cancl.c mmsl/rq_ackev.c mmsl/msdataas.c mmsl/ms_tdef4.c mmsl/ms_tdef2.c mmsl/ms_tdef.c mmsl/ms_size.c mmsl/ms_ext.c mmsl/mmsstat.c mmsl/mmslvar.c mmsl/mmsl_fin.c mmsl/mmsinit.c mmsl/mmsdtext.c mmsl/mmsdec.c mmsl/mmsdatat.c mmsl/mmsdata.c mmsl/mmsconcl.c mmsl/mmscancl.c mmsl/mms_tdef.c mmsl/mms_rtaa.c mmsl/mms_rej.c mmsl/mms_err4.c mmsl/mms_err3.c mmsl/mms_err2.c mmsl/mms_err.c mmsl/mms_ced7.c mmsl/mms_ced6.c mmsl/mms_ced5.c mmsl/mms_ced4.c mmsl/mms_ced3.c mmsl/mms_ced.c mmsl/mms_aref.c mmsl/mms_alta.c mmsl/mms_adl.c mmsle/rs_uploa.c mmsle/rs_termu.c mmsle/rs_termd.c mmsle/rs_takec.c mmsle/rs_store.c mmsle/rs_stop.c mmsle/rs_start.c mmsle/rs_rssta.c mmsle/rs_rspoo.c mmsle/rs_rsent.c mmsle/rs_resum.c mmsle/rs_reset.c mmsle/rs_renam.c mmsle/rs_relct.c mmsle/rs_rdupl.c mmsle/rs_rddwn.c mmsle/rs_outpu.c mmsle/rs_obtfi.c mmsle/rs_loadd.c mmsle/rs_kill.c mmsle/rs_jwrit.c mmsle/rs_jstat.c mmsle/rs_jread.c mmsle/rs_jinit.c mmsle/rs_jdele.c mmsle/rs_jcrea.c mmsle/rs_input.c mmsle/rs_initu.c mmsle/rs_initd.c mmsle/rs_getsc.c mmsle/rs_getas.c mmsle/rs_getae.c mmsle/rs_frena.c mmsle/rs_fread.c mmsle/rs_fopen.c mmsle/rs_fdir.c mmsle/rs_fdele.c mmsle/rs_fclos.c mmsle/rs_downl.c mmsle/rs_delvl.c mmsle/rs_delva.c mmsle/rs_delty.c mmsle/rs_delse.c mmsle/rs_delpi.c mmsle/rs_delee.c mmsle/rs_delec.c mmsle/rs_delea.c mmsle/rs_deldo.c mmsle/rs_defvl.c mmsle/rs_defva.c mmsle/rs_defty.c mmsle/rs_defse.c mmsle/rs_defsc.c mmsle/rs_defec.c mmsle/rs_defea.c mmsle/rs_crepi.c mmsle/rs_altee.c mmsle/rs_altec.c mmsle/rq_uploa.c mmsle/rq_termu.c mmsle/rq_termd.c mmsle/rq_takec.c mmsle/rq_store.c mmsle/rq_stop.c mmsle/rq_start.c mmsle/rq_rssta.c mmsle/rq_rspoo.c mmsle/rq_rsent.c mmsle/rq_resum.c mmsle/rq_reset.c mmsle/rq_renam.c mmsle/rq_relct.c mmsle/rq_rdupl.c mmsle/rq_rddwn.c mmsle/rq_outpu.c mmsle/rq_obtfi.c mmsle/rq_loadd.c mmsle/rq_kill.c mmsle/rq_jwrit.c mmsle/rq_jstat.c mmsle/rq_jread.c mmsle/rq_jinit.c mmsle/rq_jdele.c mmsle/rq_jcrea.c mmsle/rq_input.c mmsle/rq_initu.c mmsle/rq_initd.c mmsle/rq_getsc.c mmsle/rq_getas.c mmsle/rq_getae.c mmsle/rq_frena.c mmsle/rq_fread.c mmsle/rq_fopen.c mmsle/rq_fdir.c mmsle/rq_fdele.c mmsle/rq_fclos.c mmsle/rq_downl.c mmsle/rq_delvl.c mmsle/rq_delva.c mmsle/rq_delty.c mmsle/rq_delse.c mmsle/rq_delpi.c mmsle/rq_delee.c mmsle/rq_delec.c mmsle/rq_delea.c mmsle/rq_deldo.c mmsle/rq_defvl.c mmsle/rq_defva.c mmsle/rq_defty.c mmsle/rq_defse.c mmsle/rq_defsc.c mmsle/rq_defec.c mmsle/rq_defea.c mmsle/rq_crepi.c mmsle/rq_altee.c mmsle/rq_altec.c mmsle/mms_ced2.c mmsle/mms_ced1.c mvlu/sclproc.c mvlu/s_write.c mvlu/s_status.c mvlu/s_read.c mvlu/s_obtfi.c mvlu/s_jstat.c mvlu/s_jread.c mvlu/s_jinit.c mvlu/s_info.c mvlu/s_ident.c mvlu/s_getvla.c mvlu/s_getvaa.c mvlu/s_getnam.c mvlu/s_getdom.c mvlu/s_getcl.c mvlu/s_fren.c mvlu/s_fread.c mvlu/s_fopen.c mvlu/s_fdir.c mvlu/s_fdel.c mvlu/s_fclose.c mvlu/s_delvl.c mvlu/s_defvl.c mvlu/s_concl.c mvlu/s_cancel.c mvlu/mvluleaf.c mvlu/mvlu_sbo.c mvlu/mvlu_rt.c mvlu/mvlu_rpt.c mvlu/mvl61850_rpt.c mvlu/mvl61850_ctl.c mvlu/mvl61850.c mvlu/mvl_var.c mvlu/mvl_uca.c mvlu/mvl_type.c mvlu/mvl_typ2.c mvlu/mvl_serv.c mvlu/mvl_send.c mvlu/mvl_objb.c mvlu/mvl_obj.c mvlu/mvl_ijou.c mvlu/mvl_dtyp.c mvlu/mvl_buf.c mvlu/c_write.c mvlu/c_status.c mvlu/c_read.c mvlu/c_obtfi.c mvlu/c_jstat.c mvlu/c_jread.c mvlu/c_jinit.c mvlu/c_info.c mvlu/c_ident.c mvlu/c_getvla.c mvlu/c_getvar.c mvlu/c_getnam.c mvlu/c_getdom.c mvlu/c_fren.c mvlu/c_fread.c mvlu/c_fopen.c mvlu/c_fget.c mvlu/c_fdir.c mvlu/c_fdel.c mvlu/c_fclose.c mvlu/c_delvl.c mvlu/c_defvl.c mvlu/c_concl.c ositcps/tpx_dec.c ositcps/tp4port.c ositcps/tp4_enc.c ositcps/tp0main.c ositcps/tp0callg.c ositcps/tp0calld.c ositcps/tp0_socks.c ositcps/tp0_dec.c ositcps/osicfgx.c ositcps/lean_var.c ositcps/lean_cfg.c ositcps/cospmain.c ositcps/cosp_enc.c ositcps/cosp_dec.c ositcps/coppdcpr.c ositcps/coppdcp.c ositcps/coppdaru.c ositcps/copp_enc.c ositcps/copp_dec.c ositcps/checksum.c ositcps/acse2var.c ositcps/acse2enc.c ositcps/acse2dib.c ositcps/acse2dec.c slog/slogmem.c slog/slogipcs.c slog/sloghex.c slog/slogfil.c slog/slog.c slog/qmem.c ssec0/ssecusr0.c util/time_str.c util/sx_enc.c util/sx_dec.c util/sx_data.c util/sx_axs4d.c util/str_util.c util/stime.c util/stdtime_w32.c util/stdtime_quadlib.c util/stdtime_mms_utctime.c util/stdtime_mms_btime.c util/stdtime.c util/sclstore.c util/sclparse.c util/scl_log.c util/glbsem_unix.c util/glbsem.c util/gensock2.c util/genlists.c util/cfg_util.c debug/mmslibd1.0.0/ && (cd `dirname debug/mmslibd1.0.0` && $(TAR) mmslibd1.0.0.tar mmslibd1.0.0 && $(COMPRESS) mmslibd1.0.0.tar) && $(MOVE) `dirname debug/mmslibd1.0.0`/mmslibd1.0.0.tar.gz . && $(DEL_FILE) -r debug/mmslibd1.0.0 clean:compiler_clean diff --git a/mmslib/Makefile.Release b/mmslib/Makefile.Release index 485230f..8b71dfc 100644 --- a/mmslib/Makefile.Release +++ b/mmslib/Makefile.Release @@ -800,7 +800,7 @@ qmake: FORCE dist: @$(CHK_DIR_EXISTS) release/mmslib1.0.0 || $(MKDIR) release/mmslib1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) release/mmslib1.0.0/ && $(COPY_FILE) --parents mmslib.h inc/tp4api.h inc/tp4_log.h inc/tp4_encd.h inc/tp4.h inc/tp0_sock.h inc/time_str.h inc/sysincs.h inc/sx_log.h inc/sx_defs.h inc/sx_arb.h inc/STR_UTIL.H inc/stime.h inc/stdtime_w32.h inc/stdtime_tzrules.h inc/stdtime_timezone_csv.h inc/stdtime_stdint.h inc/stdtime_quadlib.h inc/stdtime_mms_utctime.h inc/stdtime_mms_btime.h inc/stdtime_enum_func.h inc/stdtime_enum_err.h inc/stdtime_endian.h inc/stdtime_config.h inc/stdtime.h inc/ssleLog.h inc/ssec_int.h inc/ssec.h inc/sock_log.h inc/smpval.h inc/smp_usr.h inc/smp_log.h inc/smp.h inc/Smem.h inc/slog.h inc/scrndefs.h inc/scl.h inc/rs_defs.h inc/rs_a.h inc/qmem.h inc/osillc.h inc/ntddosi.h inc/mvl_uca.h inc/mvl_log.h inc/mvl_defs.h inc/mvl_acse.h inc/mmslusec.h inc/mmslog.h inc/mmsldefs.h inc/mmsintr2.h inc/mmsefun.h inc/mmsdefs.h inc/mms_vvar.h inc/mms_pvmd.h inc/mms_pvar.h inc/mms_psem.h inc/mms_pprg.h inc/mms_pocs.h inc/mms_pjou.h inc/mms_pfil.h inc/mms_pevn.h inc/mms_perr.h inc/mms_pdom.h inc/mms_pcon.h inc/mms_mp.h inc/mms_log.h inc/mms_err.h inc/mms_dfun.h inc/mms_def2.h inc/mloguser.h inc/memlog.h inc/mem_chk.h inc/llcioctl.h inc/llcio.h inc/lean_a.h inc/gvaldefs.h inc/gse_mgmt.h inc/Goose.h inc/glbtypes.h inc/glbsem.h inc/glbopt.h inc/glberror.h inc/gensock2.h inc/gen_list.h inc/fkeydefs.h inc/ExceptionReport.h inc/ethsub.h inc/ethertyp.h inc/dibmatch.h inc/cosp_usr.h inc/cosp_log.h inc/cosp.h inc/copp_usr.h inc/copp_log.h inc/copp.h inc/conpack.h inc/clnpport.h inc/clnp_usr.h inc/clnp_tnt.h inc/clnp_sta.h inc/clnp_sne.h inc/clnp_log.h inc/clnp_llc.h inc/clnp.h inc/checksum.h inc/cfglog.h inc/cfg_util.h inc/asn1r.h inc/asn1log.h inc/asn1defs.h inc/arg.h inc/adlc_usr.h inc/adlc_sts.h inc/adlc_sm.h inc/adlc_log.h inc/adlc_dsm.h inc/adlc.h inc/acseauth.h inc/acse2usr.h inc/acse2log.h inc/acse2.h inc/mmsop_en/mmsop_en.h release/mmslib1.0.0/ && $(COPY_FILE) --parents mmslib.cpp asn1/asn1r.c asn1/are_vstr.c asn1/are_utc.c asn1/are_time.c asn1/are_ostr.c asn1/are_objd.c asn1/are_int.c asn1/are_flt.c asn1/are_delm.c asn1/are_btod.c asn1/are_bstr.c asn1/are_bool.c asn1/ard_vstr.c asn1/ard_utc.c asn1/ard_time.c asn1/ard_strn.c asn1/ard_ostr.c asn1/ard_objd.c asn1/ard_int.c asn1/ard_idnt.c asn1/ard_flt.c asn1/ard_delm.c asn1/ard_btod.c asn1/ard_bstr.c asn1/ard_bool.c mem/mem_chks.c mmsl/rs_write.c mmsl/rs_ustat.c mmsl/rs_trige.c mmsl/rs_stat.c mmsl/rs_repee.c mmsl/rs_repec.c mmsl/rs_repea.c mmsl/rs_read.c mmsl/rs_namel.c mmsl/rs_init.c mmsl/rs_info.c mmsl/rs_ident.c mmsl/rs_getvl.c mmsl/rs_getva.c mmsl/rs_getty.c mmsl/rs_getpi.c mmsl/rs_getee.c mmsl/rs_getec.c mmsl/rs_getea.c mmsl/rs_getdo.c mmsl/rs_getcl.c mmsl/rs_evnot.c mmsl/rs_defee.c mmsl/rs_concl.c mmsl/rs_cancl.c mmsl/rs_ackev.c mmsl/rq_write.c mmsl/rq_ustat.c mmsl/rq_trige.c mmsl/rq_stat.c mmsl/rq_repee.c mmsl/rq_repec.c mmsl/rq_repea.c mmsl/rq_read.c mmsl/rq_namel.c mmsl/rq_init.c mmsl/rq_info.c mmsl/rq_ident.c mmsl/rq_getvl.c mmsl/rq_getva.c mmsl/rq_getty.c mmsl/rq_getpi.c mmsl/rq_getee.c mmsl/rq_getec.c mmsl/rq_getea.c mmsl/rq_getdo.c mmsl/rq_getcl.c mmsl/rq_evnot.c mmsl/rq_defee.c mmsl/rq_concl.c mmsl/rq_cancl.c mmsl/rq_ackev.c mmsl/msdataas.c mmsl/ms_tdef4.c mmsl/ms_tdef2.c mmsl/ms_tdef.c mmsl/ms_size.c mmsl/ms_ext.c mmsl/mmsstat.c mmsl/mmslvar.c mmsl/mmsl_fin.c mmsl/mmsinit.c mmsl/mmsdtext.c mmsl/mmsdec.c mmsl/mmsdatat.c mmsl/mmsdata.c mmsl/mmsconcl.c mmsl/mmscancl.c mmsl/mms_tdef.c mmsl/mms_rtaa.c mmsl/mms_rej.c mmsl/mms_err4.c mmsl/mms_err3.c mmsl/mms_err2.c mmsl/mms_err.c mmsl/mms_ced7.c mmsl/mms_ced6.c mmsl/mms_ced5.c mmsl/mms_ced4.c mmsl/mms_ced3.c mmsl/mms_ced.c mmsl/mms_aref.c mmsl/mms_alta.c mmsl/mms_adl.c mmsle/rs_uploa.c mmsle/rs_termu.c mmsle/rs_termd.c mmsle/rs_takec.c mmsle/rs_store.c mmsle/rs_stop.c mmsle/rs_start.c mmsle/rs_rssta.c mmsle/rs_rspoo.c mmsle/rs_rsent.c mmsle/rs_resum.c mmsle/rs_reset.c mmsle/rs_renam.c mmsle/rs_relct.c mmsle/rs_rdupl.c mmsle/rs_rddwn.c mmsle/rs_outpu.c mmsle/rs_obtfi.c mmsle/rs_loadd.c mmsle/rs_kill.c mmsle/rs_jwrit.c mmsle/rs_jstat.c mmsle/rs_jread.c mmsle/rs_jinit.c mmsle/rs_jdele.c mmsle/rs_jcrea.c mmsle/rs_input.c mmsle/rs_initu.c mmsle/rs_initd.c mmsle/rs_getsc.c mmsle/rs_getas.c mmsle/rs_getae.c mmsle/rs_frena.c mmsle/rs_fread.c mmsle/rs_fopen.c mmsle/rs_fdir.c mmsle/rs_fdele.c mmsle/rs_fclos.c mmsle/rs_downl.c mmsle/rs_delvl.c mmsle/rs_delva.c mmsle/rs_delty.c mmsle/rs_delse.c mmsle/rs_delpi.c mmsle/rs_delee.c mmsle/rs_delec.c mmsle/rs_delea.c mmsle/rs_deldo.c mmsle/rs_defvl.c mmsle/rs_defva.c mmsle/rs_defty.c mmsle/rs_defse.c mmsle/rs_defsc.c mmsle/rs_defec.c mmsle/rs_defea.c mmsle/rs_crepi.c mmsle/rs_altee.c mmsle/rs_altec.c mmsle/rq_uploa.c mmsle/rq_termu.c mmsle/rq_termd.c mmsle/rq_takec.c mmsle/rq_store.c mmsle/rq_stop.c mmsle/rq_start.c mmsle/rq_rssta.c mmsle/rq_rspoo.c mmsle/rq_rsent.c mmsle/rq_resum.c mmsle/rq_reset.c mmsle/rq_renam.c mmsle/rq_relct.c mmsle/rq_rdupl.c mmsle/rq_rddwn.c mmsle/rq_outpu.c mmsle/rq_obtfi.c mmsle/rq_loadd.c mmsle/rq_kill.c mmsle/rq_jwrit.c mmsle/rq_jstat.c mmsle/rq_jread.c mmsle/rq_jinit.c mmsle/rq_jdele.c mmsle/rq_jcrea.c mmsle/rq_input.c mmsle/rq_initu.c mmsle/rq_initd.c mmsle/rq_getsc.c mmsle/rq_getas.c mmsle/rq_getae.c mmsle/rq_frena.c mmsle/rq_fread.c mmsle/rq_fopen.c mmsle/rq_fdir.c mmsle/rq_fdele.c mmsle/rq_fclos.c mmsle/rq_downl.c mmsle/rq_delvl.c mmsle/rq_delva.c mmsle/rq_delty.c mmsle/rq_delse.c mmsle/rq_delpi.c mmsle/rq_delee.c mmsle/rq_delec.c mmsle/rq_delea.c mmsle/rq_deldo.c mmsle/rq_defvl.c mmsle/rq_defva.c mmsle/rq_defty.c mmsle/rq_defse.c mmsle/rq_defsc.c mmsle/rq_defec.c mmsle/rq_defea.c mmsle/rq_crepi.c mmsle/rq_altee.c mmsle/rq_altec.c mmsle/mms_ced2.c mmsle/mms_ced1.c mvlu/sclproc.c mvlu/s_write.c mvlu/s_status.c mvlu/s_read.c mvlu/s_obtfi.c mvlu/s_jstat.c mvlu/s_jread.c mvlu/s_jinit.c mvlu/s_info.c mvlu/s_ident.c mvlu/s_getvla.c mvlu/s_getvaa.c mvlu/s_getnam.c mvlu/s_getdom.c mvlu/s_getcl.c mvlu/s_fren.c mvlu/s_fread.c mvlu/s_fopen.c mvlu/s_fdir.c mvlu/s_fdel.c mvlu/s_fclose.c mvlu/s_delvl.c mvlu/s_defvl.c mvlu/s_concl.c mvlu/s_cancel.c mvlu/mvluleaf.c mvlu/mvlu_sbo.c mvlu/mvlu_rt.c mvlu/mvlu_rpt.c mvlu/mvl61850_rpt.c mvlu/mvl61850_ctl.c mvlu/mvl61850.c mvlu/mvl_var.c mvlu/mvl_uca.c mvlu/mvl_type.c mvlu/mvl_typ2.c mvlu/mvl_serv.c mvlu/mvl_send.c mvlu/mvl_objb.c mvlu/mvl_obj.c mvlu/mvl_ijou.c mvlu/mvl_dtyp.c mvlu/mvl_buf.c mvlu/c_write.c mvlu/c_status.c mvlu/c_read.c mvlu/c_obtfi.c mvlu/c_jstat.c mvlu/c_jread.c mvlu/c_jinit.c mvlu/c_info.c mvlu/c_ident.c mvlu/c_getvla.c mvlu/c_getvar.c mvlu/c_getnam.c mvlu/c_getdom.c mvlu/c_fren.c mvlu/c_fread.c mvlu/c_fopen.c mvlu/c_fget.c mvlu/c_fdir.c mvlu/c_fdel.c mvlu/c_fclose.c mvlu/c_delvl.c mvlu/c_defvl.c mvlu/c_concl.c ositcps/tpx_dec.c ositcps/tp4port.c ositcps/tp4_enc.c ositcps/tp0main.c ositcps/tp0callg.c ositcps/tp0calld.c ositcps/tp0_socks.c ositcps/tp0_dec.c ositcps/osicfgx.c ositcps/lean_var.c ositcps/lean_cfg.c ositcps/cospmain.c ositcps/cosp_enc.c ositcps/cosp_dec.c ositcps/coppdcpr.c ositcps/coppdcp.c ositcps/coppdaru.c ositcps/copp_enc.c ositcps/copp_dec.c ositcps/checksum.c ositcps/acse2var.c ositcps/acse2enc.c ositcps/acse2dib.c ositcps/acse2dec.c slog/slogmem.c slog/slogipcs.c slog/sloghex.c slog/slogfil.c slog/slog.c slog/qmem.c ssec0/ssecusr0.c util/time_str.c util/sx_enc.c util/sx_dec.c util/sx_data.c util/sx_axs4d.c util/str_util.c util/stime.c util/stdtime_w32.c util/stdtime_quadlib.c util/stdtime_mms_utctime.c util/stdtime_mms_btime.c util/stdtime.c util/sclstore.c util/sclparse.c util/scl_log.c util/glbsem_unix.c util/glbsem.c util/gensock2.c util/genlists.c util/cfg_util.c release/mmslib1.0.0/ && (cd `dirname release/mmslib1.0.0` && $(TAR) mmslib1.0.0.tar mmslib1.0.0 && $(COMPRESS) mmslib1.0.0.tar) && $(MOVE) `dirname release/mmslib1.0.0`/mmslib1.0.0.tar.gz . && $(DEL_FILE) -r release/mmslib1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) release/mmslib1.0.0/ && $(COPY_FILE) --parents mmslib.h inc/tp4api.h inc/tp4_log.h inc/tp4_encd.h inc/tp4.h inc/tp0_sock.h inc/time_str.h inc/sysincs.h inc/sx_log.h inc/sx_defs.h inc/sx_arb.h inc/str_util.h inc/stime.h inc/stdtime_w32.h inc/stdtime_tzrules.h inc/stdtime_timezone_csv.h inc/stdtime_stdint.h inc/stdtime_quadlib.h inc/stdtime_mms_utctime.h inc/stdtime_mms_btime.h inc/stdtime_enum_func.h inc/stdtime_enum_err.h inc/stdtime_endian.h inc/stdtime_config.h inc/stdtime.h inc/sslelog.h inc/ssec_int.h inc/ssec.h inc/sock_log.h inc/smpval.h inc/smp_usr.h inc/smp_log.h inc/smp.h inc/smem.h inc/slog.h inc/scrndefs.h inc/scl.h inc/rs_defs.h inc/rs_a.h inc/qmem.h inc/osillc.h inc/ntddosi.h inc/mvl_uca.h inc/mvl_log.h inc/mvl_defs.h inc/mvl_acse.h inc/mmslusec.h inc/mmslog.h inc/mmsldefs.h inc/mmsintr2.h inc/mmsefun.h inc/mmsdefs.h inc/mms_vvar.h inc/mms_pvmd.h inc/mms_pvar.h inc/mms_psem.h inc/mms_pprg.h inc/mms_pocs.h inc/mms_pjou.h inc/mms_pfil.h inc/mms_pevn.h inc/mms_perr.h inc/mms_pdom.h inc/mms_pcon.h inc/mms_mp.h inc/mms_log.h inc/mms_err.h inc/mms_dfun.h inc/mms_def2.h inc/mloguser.h inc/memlog.h inc/mem_chk.h inc/llcioctl.h inc/llcio.h inc/lean_a.h inc/gvaldefs.h inc/gse_mgmt.h inc/Goose.h inc/glbtypes.h inc/glbsem.h inc/glbopt.h inc/glberror.h inc/gensock2.h inc/gen_list.h inc/fkeydefs.h inc/ExceptionReport.h inc/ethsub.h inc/ethertyp.h inc/dibmatch.h inc/cosp_usr.h inc/cosp_log.h inc/cosp.h inc/copp_usr.h inc/copp_log.h inc/copp.h inc/conpack.h inc/clnpport.h inc/clnp_usr.h inc/clnp_tnt.h inc/clnp_sta.h inc/clnp_sne.h inc/clnp_log.h inc/clnp_llc.h inc/clnp.h inc/checksum.h inc/cfglog.h inc/cfg_util.h inc/asn1r.h inc/asn1log.h inc/asn1defs.h inc/arg.h inc/adlc_usr.h inc/adlc_sts.h inc/adlc_sm.h inc/adlc_log.h inc/adlc_dsm.h inc/adlc.h inc/acseauth.h inc/acse2usr.h inc/acse2log.h inc/acse2.h inc/mmsop_en/mmsop_en.h release/mmslib1.0.0/ && $(COPY_FILE) --parents mmslib.cpp asn1/asn1r.c asn1/are_vstr.c asn1/are_utc.c asn1/are_time.c asn1/are_ostr.c asn1/are_objd.c asn1/are_int.c asn1/are_flt.c asn1/are_delm.c asn1/are_btod.c asn1/are_bstr.c asn1/are_bool.c asn1/ard_vstr.c asn1/ard_utc.c asn1/ard_time.c asn1/ard_strn.c asn1/ard_ostr.c asn1/ard_objd.c asn1/ard_int.c asn1/ard_idnt.c asn1/ard_flt.c asn1/ard_delm.c asn1/ard_btod.c asn1/ard_bstr.c asn1/ard_bool.c mem/mem_chks.c mmsl/rs_write.c mmsl/rs_ustat.c mmsl/rs_trige.c mmsl/rs_stat.c mmsl/rs_repee.c mmsl/rs_repec.c mmsl/rs_repea.c mmsl/rs_read.c mmsl/rs_namel.c mmsl/rs_init.c mmsl/rs_info.c mmsl/rs_ident.c mmsl/rs_getvl.c mmsl/rs_getva.c mmsl/rs_getty.c mmsl/rs_getpi.c mmsl/rs_getee.c mmsl/rs_getec.c mmsl/rs_getea.c mmsl/rs_getdo.c mmsl/rs_getcl.c mmsl/rs_evnot.c mmsl/rs_defee.c mmsl/rs_concl.c mmsl/rs_cancl.c mmsl/rs_ackev.c mmsl/rq_write.c mmsl/rq_ustat.c mmsl/rq_trige.c mmsl/rq_stat.c mmsl/rq_repee.c mmsl/rq_repec.c mmsl/rq_repea.c mmsl/rq_read.c mmsl/rq_namel.c mmsl/rq_init.c mmsl/rq_info.c mmsl/rq_ident.c mmsl/rq_getvl.c mmsl/rq_getva.c mmsl/rq_getty.c mmsl/rq_getpi.c mmsl/rq_getee.c mmsl/rq_getec.c mmsl/rq_getea.c mmsl/rq_getdo.c mmsl/rq_getcl.c mmsl/rq_evnot.c mmsl/rq_defee.c mmsl/rq_concl.c mmsl/rq_cancl.c mmsl/rq_ackev.c mmsl/msdataas.c mmsl/ms_tdef4.c mmsl/ms_tdef2.c mmsl/ms_tdef.c mmsl/ms_size.c mmsl/ms_ext.c mmsl/mmsstat.c mmsl/mmslvar.c mmsl/mmsl_fin.c mmsl/mmsinit.c mmsl/mmsdtext.c mmsl/mmsdec.c mmsl/mmsdatat.c mmsl/mmsdata.c mmsl/mmsconcl.c mmsl/mmscancl.c mmsl/mms_tdef.c mmsl/mms_rtaa.c mmsl/mms_rej.c mmsl/mms_err4.c mmsl/mms_err3.c mmsl/mms_err2.c mmsl/mms_err.c mmsl/mms_ced7.c mmsl/mms_ced6.c mmsl/mms_ced5.c mmsl/mms_ced4.c mmsl/mms_ced3.c mmsl/mms_ced.c mmsl/mms_aref.c mmsl/mms_alta.c mmsl/mms_adl.c mmsle/rs_uploa.c mmsle/rs_termu.c mmsle/rs_termd.c mmsle/rs_takec.c mmsle/rs_store.c mmsle/rs_stop.c mmsle/rs_start.c mmsle/rs_rssta.c mmsle/rs_rspoo.c mmsle/rs_rsent.c mmsle/rs_resum.c mmsle/rs_reset.c mmsle/rs_renam.c mmsle/rs_relct.c mmsle/rs_rdupl.c mmsle/rs_rddwn.c mmsle/rs_outpu.c mmsle/rs_obtfi.c mmsle/rs_loadd.c mmsle/rs_kill.c mmsle/rs_jwrit.c mmsle/rs_jstat.c mmsle/rs_jread.c mmsle/rs_jinit.c mmsle/rs_jdele.c mmsle/rs_jcrea.c mmsle/rs_input.c mmsle/rs_initu.c mmsle/rs_initd.c mmsle/rs_getsc.c mmsle/rs_getas.c mmsle/rs_getae.c mmsle/rs_frena.c mmsle/rs_fread.c mmsle/rs_fopen.c mmsle/rs_fdir.c mmsle/rs_fdele.c mmsle/rs_fclos.c mmsle/rs_downl.c mmsle/rs_delvl.c mmsle/rs_delva.c mmsle/rs_delty.c mmsle/rs_delse.c mmsle/rs_delpi.c mmsle/rs_delee.c mmsle/rs_delec.c mmsle/rs_delea.c mmsle/rs_deldo.c mmsle/rs_defvl.c mmsle/rs_defva.c mmsle/rs_defty.c mmsle/rs_defse.c mmsle/rs_defsc.c mmsle/rs_defec.c mmsle/rs_defea.c mmsle/rs_crepi.c mmsle/rs_altee.c mmsle/rs_altec.c mmsle/rq_uploa.c mmsle/rq_termu.c mmsle/rq_termd.c mmsle/rq_takec.c mmsle/rq_store.c mmsle/rq_stop.c mmsle/rq_start.c mmsle/rq_rssta.c mmsle/rq_rspoo.c mmsle/rq_rsent.c mmsle/rq_resum.c mmsle/rq_reset.c mmsle/rq_renam.c mmsle/rq_relct.c mmsle/rq_rdupl.c mmsle/rq_rddwn.c mmsle/rq_outpu.c mmsle/rq_obtfi.c mmsle/rq_loadd.c mmsle/rq_kill.c mmsle/rq_jwrit.c mmsle/rq_jstat.c mmsle/rq_jread.c mmsle/rq_jinit.c mmsle/rq_jdele.c mmsle/rq_jcrea.c mmsle/rq_input.c mmsle/rq_initu.c mmsle/rq_initd.c mmsle/rq_getsc.c mmsle/rq_getas.c mmsle/rq_getae.c mmsle/rq_frena.c mmsle/rq_fread.c mmsle/rq_fopen.c mmsle/rq_fdir.c mmsle/rq_fdele.c mmsle/rq_fclos.c mmsle/rq_downl.c mmsle/rq_delvl.c mmsle/rq_delva.c mmsle/rq_delty.c mmsle/rq_delse.c mmsle/rq_delpi.c mmsle/rq_delee.c mmsle/rq_delec.c mmsle/rq_delea.c mmsle/rq_deldo.c mmsle/rq_defvl.c mmsle/rq_defva.c mmsle/rq_defty.c mmsle/rq_defse.c mmsle/rq_defsc.c mmsle/rq_defec.c mmsle/rq_defea.c mmsle/rq_crepi.c mmsle/rq_altee.c mmsle/rq_altec.c mmsle/mms_ced2.c mmsle/mms_ced1.c mvlu/sclproc.c mvlu/s_write.c mvlu/s_status.c mvlu/s_read.c mvlu/s_obtfi.c mvlu/s_jstat.c mvlu/s_jread.c mvlu/s_jinit.c mvlu/s_info.c mvlu/s_ident.c mvlu/s_getvla.c mvlu/s_getvaa.c mvlu/s_getnam.c mvlu/s_getdom.c mvlu/s_getcl.c mvlu/s_fren.c mvlu/s_fread.c mvlu/s_fopen.c mvlu/s_fdir.c mvlu/s_fdel.c mvlu/s_fclose.c mvlu/s_delvl.c mvlu/s_defvl.c mvlu/s_concl.c mvlu/s_cancel.c mvlu/mvluleaf.c mvlu/mvlu_sbo.c mvlu/mvlu_rt.c mvlu/mvlu_rpt.c mvlu/mvl61850_rpt.c mvlu/mvl61850_ctl.c mvlu/mvl61850.c mvlu/mvl_var.c mvlu/mvl_uca.c mvlu/mvl_type.c mvlu/mvl_typ2.c mvlu/mvl_serv.c mvlu/mvl_send.c mvlu/mvl_objb.c mvlu/mvl_obj.c mvlu/mvl_ijou.c mvlu/mvl_dtyp.c mvlu/mvl_buf.c mvlu/c_write.c mvlu/c_status.c mvlu/c_read.c mvlu/c_obtfi.c mvlu/c_jstat.c mvlu/c_jread.c mvlu/c_jinit.c mvlu/c_info.c mvlu/c_ident.c mvlu/c_getvla.c mvlu/c_getvar.c mvlu/c_getnam.c mvlu/c_getdom.c mvlu/c_fren.c mvlu/c_fread.c mvlu/c_fopen.c mvlu/c_fget.c mvlu/c_fdir.c mvlu/c_fdel.c mvlu/c_fclose.c mvlu/c_delvl.c mvlu/c_defvl.c mvlu/c_concl.c ositcps/tpx_dec.c ositcps/tp4port.c ositcps/tp4_enc.c ositcps/tp0main.c ositcps/tp0callg.c ositcps/tp0calld.c ositcps/tp0_socks.c ositcps/tp0_dec.c ositcps/osicfgx.c ositcps/lean_var.c ositcps/lean_cfg.c ositcps/cospmain.c ositcps/cosp_enc.c ositcps/cosp_dec.c ositcps/coppdcpr.c ositcps/coppdcp.c ositcps/coppdaru.c ositcps/copp_enc.c ositcps/copp_dec.c ositcps/checksum.c ositcps/acse2var.c ositcps/acse2enc.c ositcps/acse2dib.c ositcps/acse2dec.c slog/slogmem.c slog/slogipcs.c slog/sloghex.c slog/slogfil.c slog/slog.c slog/qmem.c ssec0/ssecusr0.c util/time_str.c util/sx_enc.c util/sx_dec.c util/sx_data.c util/sx_axs4d.c util/str_util.c util/stime.c util/stdtime_w32.c util/stdtime_quadlib.c util/stdtime_mms_utctime.c util/stdtime_mms_btime.c util/stdtime.c util/sclstore.c util/sclparse.c util/scl_log.c util/glbsem_unix.c util/glbsem.c util/gensock2.c util/genlists.c util/cfg_util.c release/mmslib1.0.0/ && (cd `dirname release/mmslib1.0.0` && $(TAR) mmslib1.0.0.tar mmslib1.0.0 && $(COMPRESS) mmslib1.0.0.tar) && $(MOVE) `dirname release/mmslib1.0.0`/mmslib1.0.0.tar.gz . && $(DEL_FILE) -r release/mmslib1.0.0 clean:compiler_clean diff --git a/mmslib/inc/mvl_defs.h b/mmslib/inc/mvl_defs.h index 3c047f5..4c10a08 100644 --- a/mmslib/inc/mvl_defs.h +++ b/mmslib/inc/mvl_defs.h @@ -457,6 +457,7 @@ typedef struct mvl_net_info ST_VOID *user_info; /* MVL user can use this for 'whatever' */ MVL_NET_FILE *file_list; /* linked list of open files on this conn*/ + ST_VOID *user_ext; /* user can use this for 'whatever', add by Lzm */ } MVL_NET_INFO; /* Our connection control structures */ diff --git a/mmslib/mmslib.pro b/mmslib/mmslib.pro index f26845a..b0e5f64 100644 --- a/mmslib/mmslib.pro +++ b/mmslib/mmslib.pro @@ -379,7 +379,7 @@ HEADERS += mmslib.h \ inc/sx_log.h \ inc/sx_defs.h \ inc/sx_arb.h \ - inc/STR_UTIL.H \ + inc/str_util.h \ inc/stime.h \ inc/stdtime_w32.h \ inc/stdtime_tzrules.h \ @@ -393,7 +393,7 @@ HEADERS += mmslib.h \ inc/stdtime_endian.h \ inc/stdtime_config.h \ inc/stdtime.h \ - inc/ssleLog.h \ + inc/sslelog.h \ inc/ssec_int.h \ inc/ssec.h \ inc/sock_log.h \ @@ -401,7 +401,7 @@ HEADERS += mmslib.h \ inc/smp_usr.h \ inc/smp_log.h \ inc/smp.h \ - inc/Smem.h \ + inc/smem.h \ inc/slog.h \ inc/scrndefs.h \ inc/scl.h \