new features for door daemon

[svn42.git] / door_daemon_go / unix_socket_server.go

diff --git a/door_daemon_go/unix_socket_server.go b/door_daemon_go/unix_socket_server.go
index 886cf11..14b9226 100644 (file)
--- a/door_daemon_go/unix_socket_server.go
+++ b/door_daemon_go/unix_socket_server.go
@@ -5,6 +5,8 @@ import "bufio"
 import "strings"
 import "os"
 import "io"
+import "termios"
+import "flag"
 
 var cmdHandler = map[string]func([]string,string,*bufio.ReadWriter ) {
   "test":handleCmdTest,
@@ -14,7 +16,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,16 +34,16 @@ 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
 }
 
 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)
 }
 
@@ -49,7 +51,7 @@ func handleConnection(c net.Conn) () {
     client:=connToReadWriter(c,c)
     fmt.Println("new connection")
     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,29 +95,82 @@ 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 {
+    fmt.Printf("Serial said: %v\n",<-serial_i);
+  }
+}
 func main() {
-  serial:=openTTY("tty")
-  serial.WriteString("foo")
-  serial.Flush()
+    flag.Usage = usage
+    flag.Parse()
+
+    args := flag.Args()
+    if len(args) < 1 {
+        fmt.Println("Input file is missing.");
+        os.Exit(1);
+    }
   ln, err := net.Listen("unix", "/tmp/test.sock")
   if err != nil {
     fmt.Printf("Error: %s\n",err.Error())
     return
   }
   fmt.Printf("Listener started\n")
+
+  serial_i,serial_o:=openSerial(args[0]) 
+  go SerialHandler(serial_i)
+  serial_o<-"f"
+
   for {
     conn, err := ln.Accept()
     if err != nil {
       // handle error
-      continue
+     continue
     }
     go handleConnection(conn)
   }