Merge branch 'release/v0.5.3'

Author: DerAndereAndi

README.md

@@ -1,8 +1,8 @@
 # ship-go
 
-[![Build Status](https://github.com/enbility/ship-go/actions/workflows/default.yml/badge.svg?branch=main)](https://github.com/enbility/ship-go/actions/workflows/default.yml/badge.svg?branch=main)
+[![Build Status](https://github.com/enbility/ship-go/actions/workflows/default.yml/badge.svg?branch=master)](https://github.com/enbility/ship-go/actions/workflows/default.yml/badge.svg?branch=master)
 [![GoDoc](https://img.shields.io/badge/godoc-reference-5272B4)](https://godoc.org/github.com/enbility/ship-go)
-[![Coverage Status](https://coveralls.io/repos/github/enbility/ship-go/badge.svg?branch=main)](https://coveralls.io/github/enbility/ship-go?branch=main)
+[![Coverage Status](https://coveralls.io/repos/github/enbility/ship-go/badge.svg?branch=master)](https://coveralls.io/github/enbility/ship-go?branch=master)
 [![Go report](https://goreportcard.com/badge/github.com/enbility/ship-go)](https://goreportcard.com/report/github.com/enbility/ship-go)
 [![CodeFactor](https://www.codefactor.io/repository/github/enbility/ship-go/badge)](https://www.codefactor.io/repository/github/enbility/ship-go)
 

api/mdns.go

@@ -20,7 +20,7 @@ type MdnsEntry struct {
 
 // implemented by Hub, used by mdns
 type MdnsReportInterface interface {
-	ReportMdnsEntries(entries map[string]*MdnsEntry)
+	ReportMdnsEntries(entries map[string]*MdnsEntry, newEntries bool)
 }
 
 // implemented by mdns, used by Hub

hub/hub.go

@@ -160,5 +160,9 @@ func (h *Hub) checkAutoReannounce() {
 
 	if countPairedServices > countConnections {
 		_ = h.mdns.AnnounceMdnsEntry()
+
+		// also check currently known mDNS entries to see if they
+		// already contain the not connected remote service
+		h.mdns.RequestMdnsEntries()
 	}
 }

hub/hub_mdns.go

@@ -11,10 +11,7 @@ import (
 var _ api.MdnsReportInterface = (*Hub)(nil)
 
 // Process reported mDNS services
-func (h *Hub) ReportMdnsEntries(entries map[string]*api.MdnsEntry) {
-	h.muxMdns.Lock()
-	defer h.muxMdns.Unlock()
-
+func (h *Hub) ReportMdnsEntries(entries map[string]*api.MdnsEntry, newEntries bool) {
 	var mdnsEntries []*api.MdnsEntry
 
 	for ski, entry := range entries {
@@ -52,7 +49,11 @@ func (h *Hub) ReportMdnsEntries(entries map[string]*api.MdnsEntry) {
 		return a < b
 	})
 
-	h.knownMdnsEntries = mdnsEntries
+	if newEntries {
+		h.muxMdns.Lock()
+		h.knownMdnsEntries = mdnsEntries
+		h.muxMdns.Unlock()
+	}
 
 	var remoteServices []api.RemoteService
 

hub/hub_pairing.go

@@ -102,9 +102,12 @@ func (h *Hub) RegisterRemoteSKI(ski string) {
 		return
 	}
 
-	// if the hub has started, trigger a search and conneciton attempt
+	// if the hub has started, trigger a search and connection attempt
 	conn := h.connectionForSKI(ski)
 
+	service := h.ServiceForSKI(ski)
+	service.SetTrusted(true)
+
 	// remotely initiated?
 	if conn != nil {
 		conn.ApprovePendingHandshake()
@@ -113,8 +116,6 @@ func (h *Hub) RegisterRemoteSKI(ski string) {
 	}
 
 	// locally initiated
-	service := h.ServiceForSKI(ski)
-	service.SetTrusted(true)
 	service.ConnectionStateDetail().SetState(api.ConnectionStateQueued)
 
 	h.hubReader.ServicePairingDetailUpdate(ski, service.ConnectionStateDetail())

hub/hub_test.go

@@ -632,7 +632,7 @@ func (s *HubSuite) Test_ReportMdnsEntries() {
 	entries := make(map[string]*api.MdnsEntry)
 
 	s.hubReader.EXPECT().VisibleRemoteServicesUpdated(gomock.Any()).AnyTimes()
-	s.sut.ReportMdnsEntries(entries)
+	s.sut.ReportMdnsEntries(entries, true)
 
 	entries[testski1] = &api.MdnsEntry{
 		Ski: testski1,
@@ -648,7 +648,7 @@ func (s *HubSuite) Test_ReportMdnsEntries() {
 	service2.SetTrusted(true)
 	service2.SetIPv4("127.0.0.1")
 
-	s.sut.ReportMdnsEntries(entries)
+	s.sut.ReportMdnsEntries(entries, true)
 }
 
 func createInvalidCertificate(organizationalUnit, organization, country, commonName string) (tls.Certificate, error) {

mdns/mdns.go

@@ -67,7 +67,8 @@ type MdnsManager struct {
 
 	providerSelection MdnsProviderSelection
 
-	mux sync.Mutex
+	mux,
+	muxAnnounced sync.Mutex
 }
 
 func NewMDNS(
@@ -217,28 +218,45 @@ func (m *MdnsManager) AnnounceMdnsEntry() error {
 		return err
 	}
 
-	m.isAnnounced = true
+	m.mux.Lock()
+	defer m.mux.Unlock()
+
+	m.setIsServiceAnnounce(true)
 
 	return nil
 }
 
 // Stop the mDNS announcement on the network
 func (m *MdnsManager) UnannounceMdnsEntry() {
-	if !m.isAnnounced || m.mdnsProvider == nil {
+	if !m.isServiceAnnounced() || m.mdnsProvider == nil {
 		return
 	}
 
 	m.mdnsProvider.Unannounce()
 	logging.Log().Debug("mdns: stop announcement")
 
-	m.isAnnounced = false
+	m.setIsServiceAnnounce(false)
+}
+
+func (m *MdnsManager) isServiceAnnounced() bool {
+	m.muxAnnounced.Lock()
+	defer m.muxAnnounced.Unlock()
+
+	return m.isAnnounced
+}
+
+func (m *MdnsManager) setIsServiceAnnounce(value bool) {
+	m.muxAnnounced.Lock()
+	defer m.muxAnnounced.Unlock()
+
+	m.isAnnounced = value
 }
 
 func (m *MdnsManager) SetAutoAccept(accept bool) {
 	m.autoaccept = accept
 
 	// if announcement is off, don't enforce a new announcement
-	if !m.isAnnounced {
+	if !m.isServiceAnnounced() {
 		return
 	}
 
@@ -393,7 +411,7 @@ func (m *MdnsManager) processMdnsEntry(elements map[string]string, name, host st
 	}
 
 	entries := m.copyMdnsEntries()
-	go m.report.ReportMdnsEntries(entries)
+	go m.report.ReportMdnsEntries(entries, true)
 }
 
 func (m *MdnsManager) RequestMdnsEntries() {
@@ -402,5 +420,5 @@ func (m *MdnsManager) RequestMdnsEntries() {
 	}
 
 	entries := m.copyMdnsEntries()
-	go m.report.ReportMdnsEntries(entries)
+	go m.report.ReportMdnsEntries(entries, false)
 }

mdns/mdns_test.go

@@ -31,7 +31,7 @@ func (s *MdnsSuite) BeforeTest(suiteName, testName string) {
 	s.mdnsService = mocks.NewMdnsInterface(s.T())
 
 	s.mdnsSearch = mocks.NewMdnsReportInterface(s.T())
-	s.mdnsSearch.On("ReportMdnsEntries", mock.Anything).Maybe().Return()
+	s.mdnsSearch.On("ReportMdnsEntries", mock.Anything, mock.Anything).Maybe().Return()
 
 	s.mdnsProvider = mocks.NewMdnsProviderInterface(s.T())
 	s.mdnsProvider.On("ResolveEntries", mock.Anything, mock.Anything).Maybe().Return()
@@ -164,7 +164,7 @@ func (s *MdnsSuite) Test_MdnsEntries() {
 	err := s.sut.Start(s.mdnsSearch)
 	assert.Nil(s.T(), err)
 
-	s.mdnsSearch.EXPECT().ReportMdnsEntries(mock.Anything).Maybe()
+	s.mdnsSearch.EXPECT().ReportMdnsEntries(mock.Anything, mock.Anything).Maybe()
 
 	s.sut.RequestMdnsEntries()
 
@@ -175,7 +175,7 @@ func (s *MdnsSuite) Test_ProcessMdnsEntry() {
 	err := s.sut.Start(s.mdnsSearch)
 	assert.Nil(s.T(), err)
 
-	s.mdnsSearch.EXPECT().ReportMdnsEntries(mock.Anything).Maybe()
+	s.mdnsSearch.EXPECT().ReportMdnsEntries(mock.Anything, mock.Anything).Maybe()
 
 	elements := make(map[string]string, 1)
 

mdns/zeroconf.go

@@ -58,12 +58,18 @@ func (z *ZeroconfProvider) Announce(serviceName string, port int, txt []string)
 		return err
 	}
 
+	z.mux.Lock()
+	defer z.mux.Unlock()
+
 	z.zc = mDNSServer
 
 	return nil
 }
 
 func (z *ZeroconfProvider) Unannounce() {
+	z.mux.Lock()
+	defer z.mux.Unlock()
+
 	if z.zc == nil {
 		return
 	}