X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=door_daemon_go%2Funix_socket_server.go;h=77a64e6ac4d4f62cb014c1095de067604a83da98;hb=bd85f1b495b8e2e1305fa2f3529b4fb8bfc592f0;hp=886cf11f1b0571e5073d508243f68c869d11b982;hpb=dfd331a43606073aabc96318d736a21d2ec56616;p=svn42.git

diff --git a/door_daemon_go/unix_socket_server.go b/door_daemon_go/unix_socket_server.go
index 886cf11..77a64e6 100644
--- a/door_daemon_go/unix_socket_server.go
+++ b/door_daemon_go/unix_socket_server.go
@@ -5,6 +5,22 @@ import "bufio"
 import "strings"
 import "os"
 import "io"
+import "termios"
+import "flag"
+import "regexp"
+import "sync"
+import "time"
+
+var lock sync.RWMutex
+
+type DoorConnection struct {
+  rw * bufio.ReadWriter
+  c net.Conn
+  wchan chan string
+}
+
+var DoorConnectionMap = map[uint]DoorConnection {
+}
 
 var cmdHandler = map[string]func([]string,string,*bufio.ReadWriter ) {
   "test":handleCmdTest,
@@ -14,7 +30,7 @@ var cmdHandler = map[string]func([]string,string,*bufio.ReadWriter ) {
 }
 
 
-func readLineSafe(rw *bufio.ReadWriter) (string, error) {
+func readLineSafe(rw *bufio.Reader) (string, error) {
   wasPrefix:=false
   var line string
   for isPrefix:=true;isPrefix; {
@@ -32,24 +48,30 @@ func readLineSafe(rw *bufio.ReadWriter) (string, error) {
   }
   if wasPrefix {
       fmt.Println("line too long")
-      fmt.Fprintf(rw,"line too long\n")
-      rw.Flush()
+      //fmt.Fprintf(rw,"line too long\n")
+      //rw.Flush()
       return "",nil
   }
-  return line,nil
+  reg := regexp.MustCompile("\r")
+  safe := reg.ReplaceAllString(line, "")
+  return safe,nil
 }
 
 func connToReadWriter(c io.Reader,cw io.Writer) (*bufio.ReadWriter) {
-    client_r := bufio.NewReaderSize(c,14)
-    client_w := bufio.NewWriterSize(cw,14)
+    client_r := bufio.NewReaderSize(c,1024)
+    client_w := bufio.NewWriterSize(cw,1024)
     return bufio.NewReadWriter(client_r,client_w)
 }
 
-func handleConnection(c net.Conn) () {
-    client:=connToReadWriter(c,c)
+func handleConnection(c net.Conn, client * bufio.ReadWriter, connID uint) () {
     fmt.Println("new connection")
+    defer func () {
+     lock.Lock()
+     delete(DoorConnectionMap,connID)
+     lock.Unlock()
+    }()
     for {
-         line,err:=readLineSafe(client)
+         line,err:=readLineSafe(bufio.NewReader(client))
          if err != nil {
           if err.Error() != "EOF" {
             fmt.Printf("Error: readLineSafe returned %v\n",err.Error())
@@ -93,30 +115,111 @@ func handleCmdController(tokens []string, remainStr string, client * bufio.ReadW
 }
 
 
-func openTTY(name string) *bufio.ReadWriter{
+func openTTY(name string) *os.File {
   file, err := os.OpenFile(name,os.O_RDWR  ,0600) // For read access.
   if err != nil {
     fmt.Println(err.Error())
   }
-  return connToReadWriter(file,file) 
+  termios.Ttyfd(file.Fd())
+  termios.SetRaw()
+  return file 
+}
+func usage() {
+    fmt.Fprintf(os.Stderr, "usage: myprog [inputfile]\n")
+    flag.PrintDefaults()
+    os.Exit(2)
+}
+
+func SerialWriter(c chan string, serial * os.File ) {
+  for {
+    serial.WriteString(<-c)
+    serial.Sync()
+  }
+}
+
+func SerialReader(c chan string , serial * bufio.Reader) {
+  for {
+    s,err := readLineSafe(serial)
+    if (s=="") {
+     continue
+    }
+    if (err!=nil) {
+     fmt.Printf("Error in read from serial: %v\n",err.Error())
+     os.Exit(1)
+    }
+    //fmt.Printf("Serial: Read %v\n",s);
+    c<-s
+  }
 }
 
+func openSerial(filename string) (chan string,chan string) {
+  serial:=openTTY(filename)
+  in:=make(chan string)
+  out:=make(chan string)
+  go SerialWriter(out,serial)
+  go SerialReader(in,bufio.NewReaderSize(serial,128))
+  return in,out
+}
+
+func SerialHandler(serial_i chan string) {
+  for {
+    line:=<-serial_i
+    fmt.Printf("Serial Read: %s\n",line)
+    lock.RLock()
+    for _, v := range DoorConnectionMap{
+      select {
+        case v.wchan<-line:
+
+        case <-time.After(2):
+
+      }
+    }
+    lock.RUnlock()
+  }
+}
+
+func chanWriter(c chan string, w io.Writer) {
+  for {
+    line := <-c
+     w.Write([]byte(line))
+     w.Write([]byte("\n"))
+  }
+}
 func main() {
-  serial:=openTTY("tty")
-  serial.WriteString("foo")
-  serial.Flush()
+//    lock = make(sync.RWMutex)
+    flag.Usage = usage
+    flag.Parse()
+
+    args := flag.Args()
+    if len(args) < 1 {
+        fmt.Println("Input file is missing.");
+        os.Exit(1);
+    }
+  serial_i,serial_o:=openSerial(args[0]) 
+  go SerialHandler(serial_i)
+  serial_o<-"f"
+
   ln, err := net.Listen("unix", "/tmp/test.sock")
   if err != nil {
     fmt.Printf("Error: %s\n",err.Error())
     return
   }
   fmt.Printf("Listener started\n")
+
+  var connectionID uint =0
   for {
     conn, err := ln.Accept()
     if err != nil {
       // handle error
-      continue
+     continue
     }
-    go handleConnection(conn)
+   client:=connToReadWriter(conn,conn)
+   connectionID++
+   writeChan := make(chan string)
+   lock.Lock()
+   DoorConnectionMap[connectionID]= DoorConnection{ rw:client,c:conn, wchan:writeChan }
+   lock.Unlock()
+   go handleConnection(conn,client,connectionID)
+   go chanWriter(writeChan,conn)
   }
 }