Browse Source

Avoid to receive/send own attestations.

pull/51/head
Simon Eisenmann 11 years ago
parent
commit
8c0afbe0b0
  1. 6
      src/app/spreed-webrtc-server/server.go
  2. 8
      static/js/services/buddydata.js

6
src/app/spreed-webrtc-server/server.go

@ -178,9 +178,13 @@ func (s *Server) OnText(c *Connection, b Buffer) {
func (s *Server) Unicast(c *Connection, to string, m interface{}) { func (s *Server) Unicast(c *Connection, to string, m interface{}) {
outgoing := &DataOutgoing{From: c.Id, To: to, Data: m}
if c.Id != to {
outgoing.A = c.Session.Attestation()
}
b := c.h.buffers.New() b := c.h.buffers.New()
encoder := json.NewEncoder(b) encoder := json.NewEncoder(b)
err := encoder.Encode(&DataOutgoing{From: c.Id, To: to, Data: m, A: c.Session.Attestation()}) err := encoder.Encode(outgoing)
if err != nil { if err != nil {
b.Decref() b.Decref()
log.Println("Unicast error while encoding JSON", err) log.Println("Unicast error while encoding JSON", err)

8
static/js/services/buddydata.js

@ -21,7 +21,7 @@
define(['underscore'], function(underscore) { define(['underscore'], function(underscore) {
// buddyData // buddyData
return ["contactData", "mediaStream", "$rootScope", function(contactData, mediaStream, $rootScope) { return ["appData", "contactData", "mediaStream", "$rootScope", function(appData, contactData, mediaStream, $rootScope) {
var scopes = {}; var scopes = {};
var brain = {}; var brain = {};
@ -184,6 +184,12 @@ define(['underscore'], function(underscore) {
// Listen for attestation events. // Listen for attestation events.
mediaStream.api.e.on("received.attestation", function(event, from, attestation) { mediaStream.api.e.on("received.attestation", function(event, from, attestation) {
var data = appData.get();
if (data && data.id === from) {
// Ignore own id.
return;
}
var current = attestations[from]; var current = attestations[from];
var create = false; var create = false;
if (!current) { if (!current) {

Loading…
Cancel
Save