Skip to content

Commit 97ef16f

Browse files
committed
Make AuthenticationPacket properties public
This is more like a bag of data than anything else.
1 parent 2d29f0d commit 97ef16f

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed
Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,40 @@
1+
var _ = require('underscore');
12
var Auth = require('../../../Auth');
23
var OutgoingPacket = require('../../../OutgoingPacket');
34

45
// Client_Authentication_Packet (MySql >= 4.1)
56
// http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol#Client_Authentication_Packet
67
module.exports = AuthenticationPacket;
78
function AuthenticationPacket(properties) {
8-
this._number = properties.number;
9-
this._scrambleBuffer = properties.scrambleBuffer;
10-
this._password = properties.password;
11-
this._user = properties.user;
12-
this._database = properties.database;
13-
this._flags = properties.flags;
14-
this._maxPacketSize = properties.maxPacketSize;
15-
this._charsetNumber = properties.charsetNumber;
9+
this.number = null;
10+
this.scrambleBuffer = null;
11+
this.password = null;
12+
this.user = null;
13+
this.database = null;
14+
this.flags = null;
15+
this.maxPacketSize = null;
16+
this.charsetNumber = null;
17+
18+
_.extend(this, properties);
1619
}
1720

1821
AuthenticationPacket.prototype.toBuffer = function() {
19-
var token = Auth.token(this._password, this._scrambleBuffer);
22+
var token = Auth.token(this.password, this.scrambleBuffer);
2023
var packetSize = (
2124
4 + 4 + 1 + 23 +
22-
this._user.length + 1 +
25+
this.user.length + 1 +
2326
token.length + 1 +
24-
this._database.length + 1
27+
this.database.length + 1
2528
);
26-
var packet = new OutgoingPacket(packetSize, this._number);
29+
var packet = new OutgoingPacket(packetSize, this.number);
2730

28-
packet.writeNumber(4, this._flags);
29-
packet.writeNumber(4, this._maxPacketSize);
30-
packet.writeNumber(1, this._charsetNumber);
31+
packet.writeNumber(4, this.flags);
32+
packet.writeNumber(4, this.maxPacketSize);
33+
packet.writeNumber(1, this.charsetNumber);
3134
packet.writeFiller(23);
32-
packet.writeNullTerminated(this._user);
35+
packet.writeNullTerminated(this.user);
3336
packet.writeLengthCoded(token);
34-
packet.writeNullTerminated(this._database);
37+
packet.writeNullTerminated(this.database);
3538

3639
return packet.buffer;
3740
};

0 commit comments

Comments
 (0)