diff --git a/go.mod b/go.mod index 2259bbe..2e67236 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,6 @@ go 1.17 require ( MINSync v0.0.0 - //github.com/rakanalh/scheduler v0.1 - github.com/deckarep/golang-set v1.8.0 github.com/go-co-op/gocron v1.13.0 github.com/liyue201/gostl v1.0.1 github.com/olekukonko/tablewriter v0.0.5 diff --git a/lsdb/Lsdb.go b/lsdb/Lsdb.go index c8b0883..d27e0f5 100644 --- a/lsdb/Lsdb.go +++ b/lsdb/Lsdb.go @@ -95,7 +95,12 @@ func (l *Lsdb) Init(mc *common.MlsrConfig, ms *MlsrScheduler, common2.LogFatal("lsdb.LsaContainer init error, ", err.Error()) } - // todo 构造sync + // 构造sync + // dummyClientLogicFace := + // l.sync = communication.NewSyncLogicHandler(nil, + // func(identifier *component.Identifier, lsaType lsa.LsaType, seq, incomingLogicFaceId uint64) bool { + + // },&l.mlsrConfig.MlsrConfigParameters) // lsa刷新时间 l.lsaRefreshTime = l.mlsrConfig.GetLsaRefreshTime() diff --git a/mlsrcmd/mlsr.go b/mlsrcmd/mlsr.go index 9449c83..bcc36d6 100644 --- a/mlsrcmd/mlsr.go +++ b/mlsrcmd/mlsr.go @@ -13,6 +13,7 @@ import ( "minlib/component" "minlib/logicface" "minlib/security" + utils2 "minlib/utils" "mlsr/common" "mlsr/hello" "mlsr/lsa" @@ -37,7 +38,7 @@ type Mlsr struct { m_helloProtocol *hello.HelloProtocol // 用于异步事件触发的信号量接收器 - m_onNewLsaConnection *utils.SignalConnection + m_onNewLsaConnection *utils2.Connection m_onPrefixRegistrationSuccess *utils.SignalConnection m_onInitialHelloDataValidated *utils.SignalConnection } @@ -90,6 +91,9 @@ func (m *Mlsr) Init(face *logicface.LogicFaceICN, scheduler *lsdb.MlsrScheduler, m.m_helloProtocol = new(hello.HelloProtocol) m.m_helloProtocol.Init(m.m_face, m.m_scheduler, chain, m.m_confParam, m.m_routingTable, m.m_lsdb) + // NewLSAConnection + // sync := m.m_lsdb.GetSync() + // m.m_onNewLsaConnection = m.m_lsdb. // 三个信号量接收器的触发 todo 还没实现的两个,一个与sync有关,一个与fib有关 // hello信号量接收器 bindHelloFunc := func(args ...interface{}) {