From 8cfec389c66fe9935800da5361dc065668250679 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Tue, 4 Jun 2013 16:27:47 +0800
Subject: [PATCH] update usage

---
 README.md   | 29 ++++++++++++++++-------------
 src/utils.c | 22 +++++++++++++++-------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index b8fde3aa..26a5b07f 100644
--- a/README.md
+++ b/README.md
@@ -66,22 +66,25 @@ Usage
 ```
 usage:
 
-    ss-local -s server_host -p server_port -l local_port -k password
-       [-m encrypt_method] [-f pid_file] [-t timeout] [-c config_file]
-
-    ss-redir -s server_host -p server_port -l local_port -k password
-       [-m encrypt_method] [-f pid_file] [-t timeout] [-c config_file]
-
-    ss-server -s server_host -p server_port -k password
-       [-m encrypt_method] [-f pid_file] [-t timeout] [-c config_file]
+ss-[local|redir|server]
+      -s <server_host>        -p <server_port>
+      -l <local_port>         -k <password>
+      [-m <encrypt_method>]   [-f <pid_file>]
+      [-t <timeout>]          [-c <config_file>]
+      [-i <interface>]        [-b <local_address>]
 
 options:
 
-    encrypt_method:     table, rc4, aes-128-cfb, aes-192-cfb, aes-256-cfb,
-                        bf-cfb, cast5-cfb, des-cfb
-          pid_file:     valid path to the pid file
-           timeout:     socket timeout in senconds
-       config_file:     json format config file
+encrypt_method:   table, rc4,
+                  aes-128-cfb, aes-192-cfb, aes-256-cfb,
+                  bf-cfb, camellia-128-cfb, camellia-192-cfb,
+                  camellia-256-cfb, cast5-cfb, des-cfb,
+                  idea-cfb, rc2-cfb and seed-cfb
+      pid_file:   valid path to the pid file
+       timeout:   socket timeout in senconds
+   config_file:   json format config file
+     interface:   specific network interface to bind
+ local_address:   specific address clients listen on
 
 notes:
 
diff --git a/src/utils.c b/src/utils.c
index fce357d2..8d3c3cee 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -66,15 +66,23 @@ void usage() {
     printf("  maintained by Max Lv <max.c.lv@gmail.com>\n\n");
     printf("  usage:\n\n");
     printf("    ss-[local|redir|server]\n");
-    printf("          -s server_host -p server_port -l local_port -k password\n");
-    printf("          [-m encrypt_method] [-f pid_file] [-t timeout] [-c config_file]\n");
+    printf("          -s <server_host>        -p <server_port>\n");
+    printf("          -l <local_port>         -k <password>\n");
+    printf("          [-m <encrypt_method>]   [-f <pid_file>]\n");
+    printf("          [-t <timeout>]          [-c <config_file>]\n");
+    printf("          [-i <interface>]        [-b <local_address>]\n");
     printf("\n");
     printf("  options:\n\n");
-    printf("    encrypt_method:     table, rc4, aes-128-cfb, aes-192-cfb, aes-256-cfb,\n");
-    printf("                        bf-cfb, cast5-cfb, des-cfb\n");
-    printf("          pid_file:     valid path to the pid file\n");
-    printf("           timeout:     socket timeout in senconds\n");
-    printf("       config_file:     json format config file\n");
+    printf("    encrypt_method:   table, rc4,\n"); 
+    printf("                      aes-128-cfb, aes-192-cfb, aes-256-cfb,\n");
+    printf("                      bf-cfb, camellia-128-cfb, camellia-192-cfb,\n");
+    printf("                      camellia-256-cfb, cast5-cfb, des-cfb,\n");
+    printf("                      idea-cfb, rc2-cfb and seed-cfb\n");
+    printf("          pid_file:   valid path to the pid file\n");
+    printf("           timeout:   socket timeout in senconds\n");
+    printf("       config_file:   json format config file\n");
+    printf("         interface:   specific network interface to bind\n");
+    printf("     local_address:   specific address clients listen on\n");
     printf("\n");
 }