Merge pull request #61 from onetwotrip/dev

Fix imports path

Godeps/Godeps.json

@@ -1,5 +1,5 @@
 {
-	"ImportPath": "snail007/proxy",
+	"ImportPath": "github.com/snail007/goproxy",
 	"GoVersion": "go1.9",
 	"GodepVersion": "v80",
 	"Packages": [

config.go

@@ -4,12 +4,12 @@ import (
 	"bufio"
 	"crypto/sha1"
 	"fmt"
+	"github.com/snail007/goproxy/services"
+	"github.com/snail007/goproxy/services/kcpcfg"
+	"github.com/snail007/goproxy/utils"
 	"log"
 	"os"
 	"os/exec"
-	"snail007/proxy/services"
-	"snail007/proxy/services/kcpcfg"
-	"snail007/proxy/utils"
 	"time"
 
 	kcp "github.com/xtaci/kcp-go"

main.go

@@ -1,10 +1,10 @@
 package main
 
 import (
+	"github.com/snail007/goproxy/services"
 	"log"
 	"os"
 	"os/signal"
-	"snail007/proxy/services"
 	"syscall"
 )
 

sdk/android-ios/sdk.go

@@ -3,10 +3,10 @@ package proxy
 import (
 	"crypto/sha1"
 	"fmt"
+	"github.com/snail007/goproxy/services"
+	"github.com/snail007/goproxy/services/kcpcfg"
 	"log"
 	"os"
-	"snail007/proxy/services"
-	"snail007/proxy/services/kcpcfg"
 	"strings"
 
 	kcp "github.com/xtaci/kcp-go"

sdk/windows-linux/sdk.go

@@ -2,12 +2,12 @@ package main
 
 import (
 	"C"
-	sdk "snail007/proxy/sdk/android-ios"
+	sdk "github.com/snail007/goproxy/sdk/android-ios"
 )
 
 //export Start
-func Start(serviceID *C.char,serviceArgsStr *C.char) (errStr *C.char) {
+func Start(serviceID *C.char, serviceArgsStr *C.char) (errStr *C.char) {
-	return C.CString(sdk.Start(C.GoString(serviceID),C.GoString(serviceArgsStr)))
+	return C.CString(sdk.Start(C.GoString(serviceID), C.GoString(serviceArgsStr)))
 }
 
 //export Stop

services/args.go

@@ -1,7 +1,7 @@
 package services
 
 import (
-	"snail007/proxy/services/kcpcfg"
+	"github.com/snail007/goproxy/services/kcpcfg"
 
 	"golang.org/x/crypto/ssh"
 )

services/http.go

@@ -2,13 +2,13 @@ package services
 
 import (
 	"fmt"
+	"github.com/snail007/goproxy/utils"
+	"github.com/snail007/goproxy/utils/conncrypt"
 	"io"
 	"io/ioutil"
 	"log"
 	"net"
 	"runtime/debug"
-	"snail007/proxy/utils"
-	"snail007/proxy/utils/conncrypt"
 	"strconv"
 	"strings"
 	"time"

services/mux_bridge.go

@@ -3,11 +3,11 @@ package services
 import (
 	"bufio"
 	"fmt"
+	"github.com/snail007/goproxy/utils"
 	"io"
 	"log"
 	"math/rand"
 	"net"
-	"snail007/proxy/utils"
 	"strconv"
 	"strings"
 	"sync"

services/mux_client.go

@@ -3,10 +3,10 @@ package services
 import (
 	"crypto/tls"
 	"fmt"
+	"github.com/snail007/goproxy/utils"
 	"io"
 	"log"
 	"net"
-	"snail007/proxy/utils"
 	"time"
 
 	"github.com/golang/snappy"

services/mux_server.go

@@ -3,12 +3,12 @@ package services
 import (
 	"crypto/tls"
 	"fmt"
+	"github.com/snail007/goproxy/utils"
 	"io"
 	"log"
 	"math/rand"
 	"net"
 	"runtime/debug"
-	"snail007/proxy/utils"
 	"strconv"
 	"strings"
 	"time"

services/socks.go

@@ -3,14 +3,14 @@ package services
 import (
 	"crypto/tls"
 	"fmt"
+	"github.com/snail007/goproxy/utils"
+	"github.com/snail007/goproxy/utils/aes"
+	"github.com/snail007/goproxy/utils/socks"
+	"github.com/snail007/goproxy/utils/conncrypt"
 	"io/ioutil"
 	"log"
 	"net"
 	"runtime/debug"
-	"snail007/proxy/utils"
-	"snail007/proxy/utils/aes"
-	"snail007/proxy/utils/conncrypt"
-	"snail007/proxy/utils/socks"
 	"strings"
 	"time"
 

services/sps.go

@@ -5,13 +5,13 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
+	"github.com/snail007/goproxy/utils"
+	"github.com/snail007/goproxy/utils/socks"
+	"github.com/snail007/goproxy/utils/conncrypt"
 	"io/ioutil"
 	"log"
 	"net"
 	"runtime/debug"
-	"snail007/proxy/utils"
-	"snail007/proxy/utils/conncrypt"
-	"snail007/proxy/utils/socks"
 	"strconv"
 	"strings"
 	"time"

services/tcp.go

@@ -3,11 +3,11 @@ package services
 import (
 	"bufio"
 	"fmt"
+	"github.com/snail007/goproxy/utils"
 	"io"
 	"log"
 	"net"
 	"runtime/debug"
-	"snail007/proxy/utils"
 	"time"
 
 	"strconv"

services/tunnel_bridge.go

@@ -3,9 +3,9 @@ package services
 import (
 	"bytes"
 	"fmt"
+	"github.com/snail007/goproxy/utils"
 	"log"
 	"net"
-	"snail007/proxy/utils"
 	"strconv"
 	"time"
 

services/tunnel_client.go

@@ -3,10 +3,10 @@ package services
 import (
 	"crypto/tls"
 	"fmt"
+	"github.com/snail007/goproxy/utils"
 	"io"
 	"log"
 	"net"
-	"snail007/proxy/utils"
 	"time"
 
 	"github.com/xtaci/smux"

services/tunnel_server.go

@@ -3,11 +3,11 @@ package services
 import (
 	"crypto/tls"
 	"fmt"
+	"github.com/snail007/goproxy/utils"
 	"io"
 	"log"
 	"net"
 	"runtime/debug"
-	"snail007/proxy/utils"
 	"strconv"
 	"strings"
 	"time"

services/udp.go

@@ -3,13 +3,13 @@ package services
 import (
 	"bufio"
 	"fmt"
+	"github.com/snail007/goproxy/services/kcpcfg"
+	"github.com/snail007/goproxy/utils"
 	"hash/crc32"
 	"io"
 	"log"
 	"net"
 	"runtime/debug"
-	"snail007/proxy/services/kcpcfg"
-	"snail007/proxy/utils"
 	"strconv"
 	"strings"
 	"time"

utils/functions.go

@@ -10,6 +10,7 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
+	"github.com/snail007/goproxy/services/kcpcfg"
 	"io"
 	"io/ioutil"
 	"log"
@@ -18,11 +19,10 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
-	"snail007/proxy/services/kcpcfg"
 
 	"golang.org/x/crypto/pbkdf2"
 
-	"snail007/proxy/utils/id"
+	"github.com/snail007/goproxy/utils/id"
 	"strconv"
 	"strings"
 	"time"

utils/serve-channel.go

@@ -2,10 +2,10 @@ package utils
 
 import (
 	"fmt"
+	"github.com/snail007/goproxy/services/kcpcfg"
 	"log"
 	"net"
 	"runtime/debug"
-	"snail007/proxy/services/kcpcfg"
 	"strconv"
 
 	kcp "github.com/xtaci/kcp-go"

utils/socks/server.go

@@ -2,8 +2,8 @@ package socks
 
 import (
 	"fmt"
+	"github.com/snail007/goproxy/utils"
 	"net"
-	"snail007/proxy/utils"
 	"strings"
 	"time"
 )

utils/structs.go

@@ -6,13 +6,13 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
+	"github.com/snail007/goproxy/services/kcpcfg"
+	"github.com/snail007/goproxy/utils/sni"
 	"io"
 	"io/ioutil"
 	"log"
 	"net"
 	"net/url"
-	"snail007/proxy/services/kcpcfg"
-	"snail007/proxy/utils/sni"
 	"strings"
 	"sync"
 	"time"