Skip to content

Commit 84cd9f4

Browse files
committed
Fixed bug oncall and onbroadcast selecting correct local object_id
1 parent 20c206f commit 84cd9f4

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/protocol/onbroadcast.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
dop.protocol.onbroadcast = function(node, request_id, request) {
3-
dop.protocol.onfunction(node, request_id, request, function(permission, object_id) {
4-
return permission.owner===object_id;
3+
dop.protocol.onfunction(node, request_id, request, node.owner[request[1]], function(permission) {
4+
return permission.owner===request[1];
55
});
66
};

src/protocol/oncall.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
dop.protocol.oncall = function(node, request_id, request) {
3-
dop.protocol.onfunction(node, request_id, request, function(permission) {
3+
dop.protocol.onfunction(node, request_id, request, request[1], function(permission) {
44
return permission.subscriber===1;
55
});
66
}

src/protocol/onfunction.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
// Used by dop.protocol.oncall && dop.protocol.onbroadcast
2-
dop.protocol.onfunction = function(node, request_id, request, validator) {
3-
var object_id = request[1],
4-
path = request[2],
2+
dop.protocol.onfunction = function(node, request_id, request, object_id, validator) {
3+
var path = request[2],
54
params = request[3],
65
object_data = dop.data.object[object_id];
76

8-
if (isObject(object_data) && isObject(object_data.node[node.token]) && validator(object_data.node[node.token], object_id)) {
7+
if (isObject(object_data) && isObject(object_data.node[node.token]) && validator(object_data.node[node.token])) {
98
var functionName = path.pop(),
109
object = dop.util.get(object_data.object, path),
1110
f = object[functionName];

test/protocol/broadcast.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ var transportListen = require('dop-transports').listen[transportName];
77
var transportConnect = require('dop-transports').connect[transportName];
88

99
dop.env = 'SERVER';
10+
dop.data.object_inc = 25;
1011
dopClient1.env = 'CLIENT1';
1112
dopClient2.env = 'CLIENT2';
1213

0 commit comments

Comments
 (0)