Added remote_port, local_address options.

shadowsocks · Dec 25, 2014 · 14d5347 · 14d5347
1 parent 3d397bb
commit 14d5347
Show file tree

Hide file tree

Showing 11 changed files with 86 additions and 83 deletions.
diff --git a/Cakefile b/Cakefile
@@ -1,4 +1,3 @@
-{print} = require 'util'
 {spawn} = require 'child_process'
 
 build = (callback) ->
@@ -11,7 +10,7 @@ build = (callback) ->
   coffee.stderr.on 'data', (data) ->
     process.stderr.write data.toString()
   coffee.stdout.on 'data', (data) ->
-    print data.toString()
+    console.log data.toString()
   coffee.on 'exit', (code) ->
     console.log 'build completed'
     callback?() if code is 0
@@ -23,7 +22,7 @@ test = (callback) ->
   coffee.stderr.on 'data', (data) ->
     process.stderr.write data.toString()
   coffee.stdout.on 'data', (data) ->
-    print data.toString()
+    console.log data.toString()
   coffee.on 'exit', (code) ->
     callback?() if code is 0
     process.exit code

diff --git a/args.js b/args.js
diff --git a/encrypt.js b/encrypt.js
diff --git a/local.js b/local.js
diff --git a/merge_sort.js b/merge_sort.js
diff --git a/server.js b/server.js
diff --git a/src/args.coffee b/src/args.coffee
@@ -1,13 +1,14 @@
 
 exports.parseArgs = ->
   defination =
+    '-b': 'local_address'
     '-l': 'local_port'
     '-s': 'server'
+    '-r': 'remote_port'
     '-k': 'password',
     '-c': 'config_file',
     '-m': 'method'
 
-
   result = {}
   nextIsValue = false
   lastKey = null
@@ -20,4 +21,4 @@ exports.parseArgs = ->
       nextIsValue = true
   result
 
-exports.version = "shadowsocks-heroku v0.9.6"
+exports.version = "shadowsocks-heroku v0.9.7"
diff --git a/src/encrypt.coffee b/src/encrypt.coffee
@@ -19,7 +19,6 @@
 # SOFTWARE.
 
 crypto = require("crypto")
-util = require("util")
 merge_sort = require("./merge_sort").merge_sort
 int32Max = Math.pow(2, 32)
 
@@ -28,7 +27,7 @@ cachedTables = {} # password: [encryptTable, decryptTable]
 getTable = (key) ->
   if cachedTables[key]
     return cachedTables[key]
-  util.log "calculating ciphers"
+  console.log "calculating ciphers"
   table = new Array(256)
   decrypt_table = new Array(256)
   md5sum = crypto.createHash("md5")
@@ -55,15 +54,15 @@ getTable = (key) ->
   result = [table, decrypt_table]
   cachedTables[key] = result
   result
-  
+
 encrypt = (table, buf) ->
   i = 0
 
   while i < buf.length
     buf[i] = table[buf[i]]
     i++
   buf
-  
+
 
 class Encryptor
   constructor: (key, @method) ->
@@ -72,20 +71,20 @@ class Encryptor
       @decipher = crypto.createDecipher @method, key
     else
       [@encryptTable, @decryptTable] = getTable(key)
-      
+
   encrypt: (buf) ->
     if @method?
       result = new Buffer(@cipher.update(buf.toString('binary')), 'binary')
       result
     else
       encrypt @encryptTable, buf
-      
+
   decrypt: (buf) ->
     if @method?
       result = new Buffer(@decipher.update(buf.toString('binary')), 'binary')
       result
     else
       encrypt @decryptTable, buf
-      
+
 exports.Encryptor = Encryptor
 exports.getTable = getTable