Merge branch 'fix-conf'

conf.c

@@ -90,9 +90,12 @@ static const struct graftcp_config_t *graftcp_getconfig(const char *key)
 {
 	int i;
 
-	for (i = 0; i < config_size; i++)
-		if (!strncmp(config[i].name, key, strlen(config[i].name)))
+#define MAX(a,b) (((a)>(b))?(a):(b))
+	for (i = 0; i < config_size; i++) {
+		if (!strncmp(config[i].name, key, MAX(strlen(config[i].name), strlen(key))))
 			return &config[i];
+	}
+#undef MAX
 	return NULL;
 }
 
@@ -120,8 +123,9 @@ static int right_space(char *buf, size_t len)
 {
 	int i;
 	for (i = len - 1; i >= 0; i--)
-		if (buf[i] != ' ' && buf[i] != '\t' && buf[i] != '\0')
-			return i;
+		if (buf[i] != ' ' && buf[i] != '\t' && buf[i] != '\0' &&
+		    buf[i] != '\n' && buf[i] != '\r')
+			return i + 1;
 	return 0;
 }
 

example-graftcp.conf

@@ -0,0 +1,21 @@
+## graftcp-local's IP address. Default: localhost
+# local_addr = localhost
+
+## Which port is graftcp-local listening? Default: 2233
+# local_port = 2233
+
+## Path of fifo to communicate with graftcp-local.
+##   Default: /tmp/graftcplocal.fifo
+# pipepath = /tmp/graftcplocal.fifo
+
+## The IP/CIDR in black-ip-file will connect direct
+# blackip_file_path =
+
+
+## Only redirect the connect that destination IP/CIDR in
+## the white-ip-file to SOCKS5
+# whiteip_file_path =
+
+## Connecting to local is not changed by default, this
+##   option will redirect it to SOCKS5
+# ignore_local