Correct webrtc callbacks to match new pions api

maxmcd · Nov 19, 2018 · 8a10808 · 8a10808
1 parent ec7138d
commit 8a10808
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,6 +16,7 @@ jobs:
           command: |
             set -e
             go get -v .
+            go get -u github.com/pions/webrtc
             go get golang.org/x/lint/golint
             golint
             go test

diff --git a/client.go b/client.go
@@ -110,10 +110,8 @@ func (cs *clientSession) run() (err error) {
 		return
 	}
 
-	cs.dc.Lock()
-	cs.dc.OnOpen = cs.dataChannelOnOpen()
-	cs.dc.Onmessage = cs.dataChannelOnMessage()
-	cs.dc.Unlock()
+	cs.dc.OnOpen(cs.dataChannelOnOpen())
+	cs.dc.OnMessage(cs.dataChannelOnMessage())
 
 	if cs.offer, err = sd.Decode(cs.offerString); err != nil {
 		log.Println(err)

diff --git a/host.go b/host.go
@@ -171,10 +171,8 @@ func (hs *hostSession) dataChannelOnMessage() func(payload datachannel.Payload)
 func (hs *hostSession) onDataChannel() func(dc *webrtc.RTCDataChannel) {
 	return func(dc *webrtc.RTCDataChannel) {
 		hs.dc = dc
-		dc.Lock()
-		defer dc.Unlock()
-		dc.OnOpen = hs.dataChannelOnOpen()
-		dc.Onmessage = hs.dataChannelOnMessage()
+		dc.OnOpen(hs.dataChannelOnOpen())
+		dc.OnMessage(hs.dataChannelOnMessage())
 	}
 }
 
@@ -186,7 +184,7 @@ func (hs *hostSession) mustReadStdin() (string, error) {
 }
 
 func (hs *hostSession) createOffer() (err error) {
-	hs.pc.OnDataChannel = hs.onDataChannel()
+	hs.pc.OnDataChannel(hs.onDataChannel())
 
 	// Create an offer to send to the browser
 	offer, err := hs.pc.CreateOffer(nil)

diff --git a/session.go b/session.go
@@ -80,8 +80,8 @@ func (s *session) createPeerConnection() (err error) {
 	// if s.pc.OnDataChannel == nil {
 	// 	return errors.New("Couldn't create a peerConnection")
 	// }
-	s.pc.OnICEConnectionStateChange = func(connectionState ice.ConnectionState) {
+	s.pc.OnICEConnectionStateChange(func(connectionState ice.ConnectionState) {
 		log.Printf("ICE Connection State has changed: %s\n", connectionState.String())
-	}
+	})
 	return
 }