update schall and discover (#228)

node/common.go

@@ -51,12 +51,13 @@ const (
 	Cach_prefix_ParseBlock  = "parseblocks"
 )
 
-func (n *Node) connectBoot() {
-	chainSt := n.GetChainState()
-	if !chainSt {
-		return
-	}
-
+func (n *Node) connectBoot(ch chan bool) {
+	defer func() {
+		ch <- true
+		if err := recover(); err != nil {
+			n.Pnc(utils.RecoverError(err))
+		}
+	}()
 	minerSt := n.GetMinerState()
 	if minerSt != pattern.MINER_STATE_POSITIVE &&
 		minerSt != pattern.MINER_STATE_FROZEN {

node/discover.go

@@ -31,7 +31,7 @@ func (n *Node) findPeers(ch chan<- bool) {
 	defer func() {
 		ch <- true
 		if err := recover(); err != nil {
-			 n.Pnc(utils.RecoverError(err))
+			n.Pnc(utils.RecoverError(err))
 		}
 	}()
 
@@ -57,18 +57,15 @@ func (n *Node) recvPeers(ch chan<- bool) {
 
 	n.Discover("info", ">>>>> start recvPeers <<<<<")
 
-	for {
-		select {
-		case foundPeer := <-n.GetDiscoveredPeers():
-			for _, v := range foundPeer.Responses {
-				if v != nil {
-					if len(v.Addrs) > 0 {
-						n.SavePeer(peer.AddrInfo{
-							ID:    v.ID,
-							Addrs: v.Addrs,
-						})
-						n.GetDht().RoutingTable().TryAddPeer(v.ID, true, true)
-					}
+	for foundPeer := range n.GetDiscoveredPeers() {
+		for _, v := range foundPeer.Responses {
+			if v != nil {
+				if len(v.Addrs) > 0 {
+					n.SavePeer(peer.AddrInfo{
+						ID:    v.ID,
+						Addrs: v.Addrs,
+					})
+					n.GetDht().RoutingTable().TryAddPeer(v.ID, true, true)
 				}
 			}
 		}

node/filereport.go

@@ -105,13 +105,22 @@ func (n *Node) reportFiles(ch chan<- bool) {
 				}
 				continue
 			}
+
 			if _, err = os.Stat(filepath.Join(n.GetDirs().FileDir, roothash)); err != nil {
 				err = os.Mkdir(filepath.Join(n.GetDirs().FileDir, roothash), os.ModeDir)
 				if err != nil {
 					n.Report("err", fmt.Sprintf("[Mkdir.FileDir(%s)] %v", roothash, err))
 					continue
 				}
 			}
+			fstat, err := os.Stat(filepath.Join(n.GetDirs().TmpDir, roothash, savedFrgment))
+			if err != nil {
+				n.Report("err", fmt.Sprintf("[os.Stat(%s)] %v", roothash, err))
+				continue
+			}
+			if fstat.Size() != pattern.FragmentSize {
+				continue
+			}
 			err = os.Rename(filepath.Join(n.GetDirs().TmpDir, roothash, savedFrgment),
 				filepath.Join(n.GetDirs().FileDir, roothash, savedFrgment))
 			if err != nil {

node/filetag.go

@@ -143,6 +143,7 @@ func (n *Node) serviceTag(ch chan<- bool) {
 			} else {
 				if len(buf) != pattern.FragmentSize {
 					recover = true
+					os.Remove(f)
 					n.Stag("err", fmt.Sprintf("[%s.%s] File fragment size [%d] is not equal to %d", fid, fragmentHash, len(buf), pattern.FragmentSize))
 				}
 			}

node/node.go

@@ -78,11 +78,13 @@ func (n *Node) Run() {
 		ch_calctag          = make(chan bool, 1)
 		ch_replace          = make(chan bool, 1)
 		ch_restoreMgt       = make(chan bool, 1)
+		ch_connectBoot      = make(chan bool, 1)
 		ch_reportLogs       = make(chan bool, 1)
 		ch_GenIdleFile      = make(chan bool, 1)
 	)
 	ch_calctag <- true
 	ch_ConnectChain <- true
+	ch_connectBoot <- true
 	ch_idlechallenge <- true
 	ch_servicechallenge <- true
 	ch_reportfiles <- true
@@ -124,7 +126,7 @@ func (n *Node) Run() {
 	}
 
 	go n.poisMgt(ch_spaceMgt)
-	go n.findPeers(ch_findPeers)
+	//go n.findPeers(ch_findPeers)
 	go n.recvPeers(ch_recvPeers)
 
 	n.Log("info", fmt.Sprintf("Use %d cpu cores", n.GetCpuCores()))
@@ -148,6 +150,10 @@ func (n *Node) Run() {
 
 		case <-task_30S.C:
 			n.SetTaskPeriod("30s")
+			if len(ch_connectBoot) > 0 {
+				<-ch_connectBoot
+				go n.connectBoot(ch_connectBoot)
+			}
 			if len(ch_reportfiles) > 0 {
 				<-ch_reportfiles
 				go n.reportFiles(ch_reportfiles)
@@ -171,7 +177,7 @@ func (n *Node) Run() {
 
 			if len(ch_findPeers) > 0 {
 				<-ch_findPeers
-				go n.findPeers(ch_findPeers)
+				//go n.findPeers(ch_findPeers)
 			}
 
 			if len(ch_recvPeers) > 0 {
@@ -202,7 +208,6 @@ func (n *Node) Run() {
 
 		case <-task_Hour.C:
 			n.SetTaskPeriod("1h")
-			go n.connectBoot()
 			// go n.UpdatePeers()
 			go n.reportLogsMgt(ch_reportLogs)
 			n.SetTaskPeriod("1h-end")

node/serviceChallenge.go

@@ -277,7 +277,7 @@ func (n *Node) calcSigma(
 			return names, us, mus, sigma, usig, err
 		}
 		for j := 0; j < len(fragments); j++ {
-			isChall = true
+			isChall = false
 			fragmentHash = filepath.Base(fragments[j])
 			ok, err = n.Has([]byte(Cach_prefix_Tag + roothash + "." + fragmentHash))
 			if err != nil {
@@ -296,6 +296,7 @@ func (n *Node) calcSigma(
 				for _, segment := range fmeta.SegmentList {
 					for _, fragment := range segment.FragmentList {
 						if sutils.CompareSlice(fragment.Miner[:], n.GetSignatureAccPulickey()) {
+							isChall = true
 							if fragmentHash == string(fragment.Hash[:]) {
 								if fragment.Tag.HasValue() {
 									ok, block := fragment.Tag.Unwrap()
@@ -315,7 +316,7 @@ func (n *Node) calcSigma(
 							}
 						}
 					}
-					if !isChall {
+					if isChall {
 						break
 					}
 				}