X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcmd%2Fgovpn-server%2Fmain.go;h=c70e82a3f1da9d22f078ec2187a14eaf30428de6;hb=4cc7cf27a64355bbe1f64418a55e860baeb63ac0;hp=5cddab87cea5d85efa7cb33bfb8109706a9ed995;hpb=e71bc62b4fbeeb9862b30b4f2ef71ae6036c61d4;p=govpn.git

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
index 5cddab8..c70e82a 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
@@ -21,6 +21,7 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"log"
 	"net"
 	"os"
@@ -37,10 +38,16 @@ var (
 	stats    = flag.String("stats", "", "Enable stats retrieving on host:port")
 	proxy    = flag.String("proxy", "", "Enable HTTP proxy on host:port")
 	egdPath  = flag.String("egd", "", "Optional path to EGD socket")
+	syslog   = flag.Bool("syslog", false, "Enable logging to syslog")
+	warranty = flag.Bool("warranty", false, "Print warranty information")
 )
 
 func main() {
 	flag.Parse()
+	if *warranty {
+		fmt.Println(govpn.Warranty)
+		return
+	}
 	timeout := time.Second * time.Duration(govpn.TimeoutDefault)
 	log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile)
 	log.Println(govpn.VersionGet())
@@ -53,6 +60,10 @@ func main() {
 		govpn.EGDInit(*egdPath)
 	}
 
+	if *syslog {
+		govpn.SyslogEnable()
+	}
+
 	switch *proto {
 	case "udp":
 		startUDP()
@@ -82,14 +93,14 @@ func main() {
 	if *proxy != "" {
 		go proxyStart()
 	}
-	log.Println("Server started")
+	govpn.BothPrintf(`[started bind="%s"]`, *bindAddr)
 
 	var needsDeletion bool
 MainCycle:
 	for {
 		select {
 		case <-termSignal:
-			log.Println("Terminating")
+			govpn.BothPrintf(`[terminating bind="%s"]`, *bindAddr)
 			for _, ps := range peers {
 				govpn.ScriptCall(
 					confs[*ps.peer.Id].Down,
@@ -103,7 +114,7 @@ MainCycle:
 			hsLock.Lock()
 			for addr, hs := range handshakes {
 				if hs.LastPing.Add(timeout).Before(now) {
-					log.Println("Deleting handshake state", addr)
+					govpn.Printf(`[handshake-delete bind="%s" addr="%s"]`, *bindAddr, addr)
 					hs.Zero()
 					delete(handshakes, addr)
 				}
@@ -116,7 +127,7 @@ MainCycle:
 				needsDeletion = ps.peer.LastPing.Add(timeout).Before(now)
 				ps.peer.BusyR.Unlock()
 				if needsDeletion {
-					log.Println("Deleting peer", ps.peer)
+					govpn.Printf(`[peer-delete bind="%s" peer="%s"]`, *bindAddr, ps.peer)
 					delete(peers, addr)
 					delete(knownPeers, addr)
 					delete(peersById, *ps.peer.Id)