dan/node-x11
1
0
Fork 0
mirror of https://github.com/danbulant/node-x11 synced 2026-06-16 13:11:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Byte order specified

Browse source
This commit is contained in:
Minko Gechev 2013-06-02 01:23:33 +03:00
parent 4407b398a4
commit 9b0457817a
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/auth.js
View file

@ -9,6 +9,14 @@ function parseXauth( buf )
{
var offset = 0;
var auth = [];
var cookieProperties = ['address', 'display', 'authName', 'authData'];
function handleCookieProperty(property) {
var length = buf.unpack('n', offset)[0];
offset += 2;
cookie[property] = buf.unpackString(length, offset);
offset += length;
}
while (offset < buf.length)
{
@ -25,20 +33,13 @@ function parseXauth( buf )
5: 'ServerInterpreted',
6: 'InternetV6'
};
var cookieFields = [
'address',
'display',
'authName',
'authData'
];
cookie.type = buf.unpack('n')[0];
offset += 2;
for (var i = 0; i < 4; i += 1) {
var length = buf.unpack('n', offset)[0];
offset += 2;
cookie[cookieFields[i]] = buf.unpackString(length, offset);
offset += length;
if (!typeToName[cookie.type]) {
console.warn('Unknown address type');
}
offset += 2;
//JSHint becomes angry when handleCookieProperty is declared inside loop
cookieProperties.forEach(handleCookieProperty);
auth.push(cookie);
}
return auth;

11
lib/handshake.js
View file

@ -180,10 +180,19 @@ bl.unpack('C', function(res) {
}
function getByteOrder() {
var isLittleEndian = ((new Uint32Array((new Uint8Array([1,2,3,4])).buffer))[0] === 0x04030201);
if (isLittleEndian) {
return 'l'.charCodeAt(0);
} else {
return 'B'.charCodeAt(0);
}
}
function writeClientHello(stream, displayNum, authHost)
{
getAuthString( displayNum, authHost, function( authType, authData ) {
var byte_order = 'l'.charCodeAt(0); // TODO: byteorder!!!
var byte_order = getByteOrder();
var protocol_major = 11; // TODO: config? env?
var protocol_minor = 0;
stream.pack(