Mirror/bittorrent-tracker
1
0
Fork 0
mirror of https://github.com/webtorrent/bittorrent-tracker.git synced 2024-12-13 19:06:27 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

server: replace request string by action number

Browse Source
This commit is contained in:
Astro 2014-12-09 00:25:29 +01:00
parent 0bc88bcf22
commit 85be917d51
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server.js
View File

@ -159,7 +159,7 @@ Server.prototype._onHttpRequest = function (req, res) {
} }
var response var response
if (params && params.request === 'announce') { if (params && params.action === common.ACTIONS.ANNOUNCE) {
var swarm = self._getSwarm(params.info_hash) var swarm = self._getSwarm(params.info_hash)
var peer = swarm.peers[params.addr] var peer = swarm.peers[params.addr]
@ -246,7 +246,7 @@ Server.prototype._onHttpRequest = function (req, res) {
res.end(bencode.encode(response)) res.end(bencode.encode(response))
debug('sent response %s', response) debug('sent response %s', response)
} else if (params.request === 'scrape') { // unofficial scrape message } else if (params.action === common.ACTIONS.SCRAPE) { // unofficial scrape message
if (typeof params.info_hash === 'string') { if (typeof params.info_hash === 'string') {
params.info_hash = [ params.info_hash ] params.info_hash = [ params.info_hash ]
} else if (params.info_hash == null) { } else if (params.info_hash == null) {
@ -307,13 +307,13 @@ Server.prototype._onUdpRequest = function (msg, rinfo) {
var socket = dgram.createSocket('udp4') var socket = dgram.createSocket('udp4')
var swarm var swarm
if (params && params.request === 'connect') { if (params && params.action === common.ACTIONS.CONNECT) {
send(Buffer.concat([ send(Buffer.concat([
common.toUInt32(common.ACTIONS.CONNECT), common.toUInt32(common.ACTIONS.CONNECT),
common.toUInt32(params.transactionId), common.toUInt32(params.transactionId),
params.connectionId params.connectionId
])) ]))
} else if (params && params.request === 'announce') { } else if (params && params.action === common.ACTIONS.ANNOUNCE) {
swarm = self._getSwarm(params.info_hash) swarm = self._getSwarm(params.info_hash)
var peer = swarm.peers[params.addr] var peer = swarm.peers[params.addr]
@ -397,7 +397,7 @@ Server.prototype._onUdpRequest = function (msg, rinfo) {
peers peers
])) ]))
} else if (params && params.request === 'scrape') { // scrape message } else if (params && params.action === common.ACTIONS.SCRAPE) { // scrape message
swarm = self._getSwarm(params.info_hash) swarm = self._getSwarm(params.info_hash)
send(Buffer.concat([ send(Buffer.concat([
@ -463,7 +463,7 @@ function parseHttpRequest (req, options) {
var params = common.querystringParse(s[1]) var params = common.querystringParse(s[1])
if (s[0] === '/announce') { if (s[0] === '/announce') {
params.request = 'announce' params.action = common.ACTIONS.ANNOUNCE
params.peer_id = typeof params.peer_id === 'string' && common.binaryToUtf8(params.peer_id) params.peer_id = typeof params.peer_id === 'string' && common.binaryToUtf8(params.peer_id)
params.port = Number(params.port) params.port = Number(params.port)
@ -489,7 +489,7 @@ function parseHttpRequest (req, options) {
return params return params
} else if (s[0] === '/scrape') { // unofficial scrape message } else if (s[0] === '/scrape') { // unofficial scrape message
params.request = 'scrape' params.action = common.ACTIONS.SCRAPE
if (typeof params.info_hash === 'string') { if (typeof params.info_hash === 'string') {
params.info_hash = [ params.info_hash ] params.info_hash = [ params.info_hash ]
@ -532,9 +532,8 @@ function parseUdpRequest (msg, rinfo) {
} }
if (params.action === common.ACTIONS.CONNECT) { if (params.action === common.ACTIONS.CONNECT) {
params.request = 'connect' // No further params
} else if (params.action === common.ACTIONS.ANNOUNCE) { } else if (params.action === common.ACTIONS.ANNOUNCE) {
params.request = 'announce'
params.info_hash = msg.slice(16, 36).toString('binary') // 20 bytes params.info_hash = msg.slice(16, 36).toString('binary') // 20 bytes
params.peer_id = msg.slice(36, 56).toString('utf8') // 20 bytes params.peer_id = msg.slice(36, 56).toString('utf8') // 20 bytes
params.downloaded = fromUInt64(msg.slice(56, 64)) // TODO: track this? params.downloaded = fromUInt64(msg.slice(56, 64)) // TODO: track this?
@ -556,7 +555,6 @@ function parseUdpRequest (msg, rinfo) {
params.addr = params.ip + ':' + params.port // TODO: ipv6 brackets params.addr = params.ip + ':' + params.port // TODO: ipv6 brackets
} else if (params.action === common.ACTIONS.SCRAPE) { // scrape message } else if (params.action === common.ACTIONS.SCRAPE) { // scrape message
params.request = 'scrape'
params.info_hash = msg.slice(16, 36).toString('binary') // 20 bytes params.info_hash = msg.slice(16, 36).toString('binary') // 20 bytes
// TODO: support multiple info_hash scrape // TODO: support multiple info_hash scrape