specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix socket.io issue; fix ACP announcements

Browse source
This commit is contained in:
calzoneman 2014-08-24 13:18:15 -05:00
parent ec9ee1d37f
commit 9be993a679
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/io/ioserver.js
View file

@ -126,10 +126,10 @@ function addTypecheckedFunctions(sock) {
* Called after a connection is accepted * Called after a connection is accepted
*/ */
function handleConnection(sock) { function handleConnection(sock) {
var ip = sock.request.connection.remoteAddress; var ip = sock.client.conn.remoteAddress;
if (!ip) { if (!ip) {
sock.emit("kick", { sock.emit("kick", {
reason: "Your IP address could not be determined from the socket connection. See https://github.com/Automattic/socket.io/issues/1387#issuecomment-48425088 for details" reason: "Your IP address could not be determined from the socket connection. See https://github.com/Automattic/socket.io/issues/1737 for details"
}); });
return; return;
} }

6
lib/server.js
View file

@ -45,6 +45,7 @@ var User = require("./user");
var $util = require("./utilities"); var $util = require("./utilities");
var db = require("./database"); var db = require("./database");
var Flags = require("./flags"); var Flags = require("./flags");
var sio = require("socket.io");
var Server = function () { var Server = function () {
var self = this; var self = this;
@ -55,7 +56,6 @@ var Server = function () {
self.announcement = null; self.announcement = null;
self.infogetter = null; self.infogetter = null;
self.servers = {}; self.servers = {};
self.ioServers = {};
// database init ------------------------------------------------------ // database init ------------------------------------------------------
var Database = require("./database"); var Database = require("./database");
@ -207,9 +207,7 @@ Server.prototype.announce = function (data) {
} else { } else {
this.announcement = data; this.announcement = data;
db.setAnnouncement(data); db.setAnnouncement(data);
for (var id in this.ioServers) { sio.instance.emit("announcement", data);
this.ioServers[id].sockets.emit("announcement", data);
}
} }
}; };