]> Cypherpunks.ru repositories - govpn.git/blobdiff - src/govpn/cmd/govpn-client/main.go
If proxy is specified, then forcefully use TCP protocol for convenience
[govpn.git] / src / govpn / cmd / govpn-client / main.go
index 6d312ce20e26873ca6c4153c8b30f1e41fd88ade..8ebb78dcc95da7c9276e387df69b3be6f5b6c544 100644 (file)
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// Simple secure free software virtual private network daemon client.
+// Simple secure, DPI/censorship-resistant free software VPN daemon client.
 package main
 
 import (
@@ -46,11 +46,18 @@ var (
        noisy      = flag.Bool("noise", false, "Enable noise appending")
        cpr        = flag.Int("cpr", 0, "Enable constant KiB/sec out traffic rate")
        egdPath    = flag.String("egd", "", "Optional path to EGD socket")
+
+       conf        *govpn.PeerConf
+       tap         *govpn.TAP
+       timeout     int
+       firstUpCall bool = true
+       knownPeers  govpn.KnownPeers
+       idsCache    govpn.CipherCache
 )
 
 func main() {
        flag.Parse()
-       timeout := *timeoutP
+       timeout = *timeoutP
        var err error
        log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile)
 
@@ -67,50 +74,22 @@ func main() {
        }
 
        pub, priv := govpn.NewVerifier(id, govpn.StringFromFile(*keyPath))
-       conf := &govpn.PeerConf{
-               Id:          id,
-               Timeout:     time.Second * time.Duration(timeout),
-               NoiseEnable: *noisy,
-               CPR:         *cpr,
-               DSAPub:      pub,
-               DSAPriv:     priv,
-       }
-       govpn.PeersInitDummy(id, conf)
-
-       var conn govpn.RemoteConn
-       var sink chan []byte
-       var ready chan struct{}
-       switch *proto {
-       case "udp":
-               conn, sink, ready = startUDP()
-       case "tcp":
-               if *proxyAddr != "" {
-                       conn, sink, ready = proxyTCP()
-               } else {
-                       conn, sink, ready = startTCP()
-               }
-       default:
-               log.Fatalln("Unknown protocol specified")
+       conf = &govpn.PeerConf{
+               Id:      id,
+               Timeout: time.Second * time.Duration(timeout),
+               Noise:   *noisy,
+               CPR:     *cpr,
+               DSAPub:  pub,
+               DSAPriv: priv,
        }
+       idsCache = govpn.NewCipherCache([]govpn.PeerId{*id})
+       log.Println(govpn.VersionGet())
 
-       tap, ethSink, ethReady, _, err := govpn.TAPListen(
-               *ifaceName,
-               time.Second*time.Duration(timeout),
-               *cpr,
-       )
+       tap, err = govpn.TAPListen(*ifaceName)
        if err != nil {
                log.Fatalln("Can not listen on TAP interface:", err)
        }
 
-       timeouts := 0
-       firstUpCall := true
-       var peer *govpn.Peer
-       var ethPkt []byte
-       var pkt []byte
-       knownPeers := govpn.KnownPeers(map[string]**govpn.Peer{*remoteAddr: &peer})
-
-       log.Println(govpn.VersionGet())
-       log.Println("Connected to", *proto, *remoteAddr)
        log.Println("Max MTU on TAP interface:", govpn.TAPMaxMTU())
        if *stats != "" {
                log.Println("Stats are going to listen on", *stats)
@@ -124,65 +103,38 @@ func main() {
        termSignal := make(chan os.Signal, 1)
        signal.Notify(termSignal, os.Interrupt, os.Kill)
 
-       log.Println("Starting handshake")
-       handshake := govpn.HandshakeStart(*remoteAddr, conn, conf)
-
 MainCycle:
        for {
-               if peer != nil && (peer.BytesIn+peer.BytesOut) > govpn.MaxBytesPerKey {
-                       peer.Zero()
-                       peer = nil
-                       handshake = govpn.HandshakeStart(*remoteAddr, conn, conf)
-                       log.Println("Rehandshaking")
+               timeouted := make(chan struct{})
+               rehandshaking := make(chan struct{})
+               termination := make(chan struct{})
+               if *proxyAddr != "" {
+                       *proto = "tcp"
+               }
+               switch *proto {
+               case "udp":
+                       go startUDP(timeouted, rehandshaking, termination)
+               case "tcp":
+                       if *proxyAddr != "" {
+                               go proxyTCP(timeouted, rehandshaking, termination)
+                       } else {
+                               go startTCP(timeouted, rehandshaking, termination)
+                       }
+               default:
+                       log.Fatalln("Unknown protocol specified")
                }
                select {
                case <-termSignal:
+                       log.Fatalln("Finishing")
+                       termination <- struct{}{}
                        break MainCycle
-               case ethPkt = <-ethSink:
-                       if peer == nil {
-                               if len(ethPkt) > 0 {
-                                       ethReady <- struct{}{}
-                               }
-                               continue
-                       }
-                       peer.EthProcess(ethPkt, ethReady)
-               case pkt = <-sink:
-                       timeouts++
-                       if timeouts >= timeout {
-                               break MainCycle
-                       }
-                       if pkt == nil {
-                               ready <- struct{}{}
-                               continue
-                       }
-
-                       if peer == nil {
-                               if govpn.IDsCache.Find(pkt) == nil {
-                                       log.Println("Invalid identity in handshake packet")
-                                       ready <- struct{}{}
-                                       continue
-                               }
-                               if p := handshake.Client(pkt); p != nil {
-                                       log.Println("Handshake completed")
-                                       if firstUpCall {
-                                               go govpn.ScriptCall(*upPath, *ifaceName)
-                                               firstUpCall = false
-                                       }
-                                       peer = p
-                                       handshake.Zero()
-                                       handshake = nil
-                               }
-                               ready <- struct{}{}
-                               continue
-                       }
-                       if peer == nil {
-                               ready <- struct{}{}
-                               continue
-                       }
-                       if peer.PktProcess(pkt, tap, ready) {
-                               timeouts = 0
-                       }
+               case <-timeouted:
+                       break MainCycle
+               case <-rehandshaking:
                }
+               close(timeouted)
+               close(rehandshaking)
+               close(termination)
        }
        govpn.ScriptCall(*downPath, *ifaceName)
 }