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

diff --git a/door_daemon_go/unix_socket_server.go b/door_daemon_go/unix_socket_server.go
index 14b9226..77a64e6 100644
--- a/door_daemon_go/unix_socket_server.go
+++ b/door_daemon_go/unix_socket_server.go
@@ -7,6 +7,20 @@ 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,
@@ -38,7 +52,9 @@ func readLineSafe(rw *bufio.Reader) (string, error) {
       //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) {
@@ -47,9 +63,13 @@ func connToReadWriter(c io.Reader,cw io.Writer) (*bufio.ReadWriter) {
     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(bufio.NewReader(client))
          if err != nil {
@@ -127,7 +147,7 @@ func SerialReader(c chan string , serial * bufio.Reader) {
      fmt.Printf("Error in read from serial: %v\n",err.Error())
      os.Exit(1)
     }
-    fmt.Printf("Serial: Read %v\n",s);
+    //fmt.Printf("Serial: Read %v\n",s);
     c<-s
   }
 }
@@ -136,17 +156,37 @@ func openSerial(filename string) (chan string,chan string) {
   serial:=openTTY(filename)
   in:=make(chan string)
   out:=make(chan string)
-  //go SerialWriter(out,serial)
+  go SerialWriter(out,serial)
   go SerialReader(in,bufio.NewReaderSize(serial,128))
   return in,out
 }
 
 func SerialHandler(serial_i chan string) {
   for {
-    fmt.Printf("Serial said: %v\n",<-serial_i);
+    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() {
+//    lock = make(sync.RWMutex)
     flag.Usage = usage
     flag.Parse()
 
@@ -155,6 +195,10 @@ func main() {
         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())
@@ -162,16 +206,20 @@ func main() {
   }
   fmt.Printf("Listener started\n")
 
-  serial_i,serial_o:=openSerial(args[0]) 
-  go SerialHandler(serial_i)
-  serial_o<-"f"
-
+  var connectionID uint =0
   for {
     conn, err := ln.Accept()
     if err != nil {
       // handle error
      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)
   }
 }