*** empty log message ***

8 files changed, 504 insertions, 48 deletions

diff --git a/apps/Makefile.am b/apps/Makefile.am
index b14601c..dd6b433 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -7,6 +7,9 @@
 # $Id$
 #
 # $Log$
+# Revision 1.6  2008/02/14 10:34:30  james
+# *** empty log message ***
+#
 # Revision 1.5  2008/02/14 02:46:44  james
 # *** empty log message ***
 #
@@ -35,7 +38,7 @@ sympathy_SOURCES = sympathy.c client.c
 sympathy_LDADD = ../src/libsympathy.a  -lutil
 
 sympathyd_SOURCES = sympathyd.c clients.c client.c
-sympathyd_LDADD = ../src/libsympathy.la  -lutil
+sympathyd_LDADD = ../src/libsympathy.a  -lutil
 
 AM_CFLAGS=-g -Werror
 
diff --git a/apps/client.c b/apps/client.c
index 90bcf60..28526f2 100644
--- a/apps/client.c
+++ b/apps/client.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.4  2008/02/14 10:34:30  james
+ * *** empty log message ***
+ *
  * Revision 1.3  2008/02/14 02:46:44  james
  * *** empty log message ***
  *
@@ -24,6 +27,8 @@ static char rcsid[] = "$Id$";
 #include <sympathy.h>
 #include "client.h"
 
+  //vt102_status_line (v, "VT102 foo bar baz I'm the urban spaceman baby");
+
 static void
 server_msg (IPC_Msg * m, Context * c)
 {
@@ -47,6 +52,9 @@ server_msg (IPC_Msg * m, Context * c)
     case IPC_MSG_TYPE_TERM:
       vt102_parse (c, m->term.term, m->term.len);
       break;
+    case IPC_MSG_TYPE_STATUS:
+	vt102_status_line(c->v,m->status.status);
+	break;
     default:
       fprintf (stderr, "Unhandeled message type %d\n", m->hdr.type);
     }
diff --git a/apps/clients.c b/apps/clients.c
index b5bafcd..cd7bcee 100644
--- a/apps/clients.c
+++ b/apps/clients.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.4  2008/02/14 10:34:30  james
+ * *** empty log message ***
+ *
  * Revision 1.3  2008/02/14 02:46:44  james
  * *** empty log message ***
  *
@@ -148,8 +151,61 @@ clients_post_select (Clients * cs, Context * ctx, fd_set * rfds,
     clients_reap (cs);
 }
 
+
+void
+clients_shutdown (Clients * cs)
+{
+  Client *c;
+
+  for (c = cs->head; c; c = c->next)
+    {
+      c->dead++;
+    }
+
+
+  clients_reap (cs);
+}
+
+
+
+
+
+
 int
-clients_output (Clients * cs, void *buf, int len)
+send_status (Clients * cs, char *msg)
+{
+  char mbuf[IPC_MAX_BUF + sizeof (IPC_Msg_status)];
+  IPC_Msg_status *m = (IPC_Msg_status *) mbuf;
+  int len;
+
+  Client *c;
+
+  if (!msg) return;
+  len=strlen(msg)+1;
+
+  if (!len)
+    return;
+  if (len > IPC_MAX_BUF)
+    len = IPC_MAX_BUF;
+
+  m->size = len + sizeof (IPC_Msg_status);
+  m->type = IPC_MSG_TYPE_STATUS;
+  strncpy(m->status,msg, IPC_MAX_BUF);
+  m->status[IPC_MAX_BUF-1]=0;
+
+  for (c = cs->head; c; c = c->next)
+    {
+      if (!c->dead)
+        if (ipc_msg_send (c->s, (IPC_Msg *) m))
+          c->dead++;
+    }
+
+  return len;
+}
+
+
+int
+send_output (Clients * cs, void *buf, int len)
 {
   char mbuf[IPC_MAX_BUF + sizeof (IPC_Msg_term)];
   IPC_Msg_term *m = (IPC_Msg_term *) mbuf;
@@ -178,15 +234,33 @@ clients_output (Clients * cs, void *buf, int len)
 }
 
 void
-clients_shutdown (Clients * cs)
+send_history (History * h, Client * c)
 {
-  Client *c;
+  int rptr = h->wptr;
 
-  for (c = cs->head; c; c = c->next)
+  HISTORY_INC (h, rptr);
+
+  HISTORY_INC (h, rptr);
+  while (rptr != h->wptr)
     {
-      c->dead++;
+      History_ent *l = &h->lines[rptr];
+      if (l->valid)
+        {
+
+          if (ipc_msg_send_history (c->s, l))
+            c->dead++;
+
+        }
+      HISTORY_INC (h, rptr);
     }
+}
 
+void
+send_vt102 (VT102 * v, Client * c)
+{
+  if (ipc_msg_send_vt102 (c->s, v))
+    c->dead++;
 
-  clients_reap (cs);
 }
+
+
diff --git a/apps/clients.h b/apps/clients.h
index c59a521..605b3cd 100644
--- a/apps/clients.h
+++ b/apps/clients.h
@@ -12,6 +12,9 @@
 
 /*
  * $Log$
+ * Revision 1.4  2008/02/14 10:34:30  james
+ * *** empty log message ***
+ *
  * Revision 1.3  2008/02/14 02:46:44  james
  * *** empty log message ***
  *
@@ -40,11 +43,18 @@ typedef struct
 } Clients;
 
 
-extern Clients *clients_new (void);
-extern void clients_pre_select (Clients *, fd_set *, fd_set *);
-extern void clients_post_select (Clients *, Context *, fd_set *, fd_set *);
-extern Client *clients_new_client (Clients *, Socket *, Context *);
-extern void clients_shutdown (Clients *);
-extern int clients_output (Clients *, void *, int);
+/* clients.c */
+extern void client_free(Client *c);
+extern Client *clients_new_client(Clients *cs, Socket *s, Context *ctx);
+extern void clients_reap(Clients *cs);
+extern Clients *clients_new(void);
+extern void clients_pre_select(Clients *cs, fd_set *rfds, fd_set *wfds);
+extern void clients_post_select(Clients *cs, Context *ctx, fd_set *rfds, fd_set *wfds);
+extern void clients_shutdown(Clients *cs);
+
+extern int send_output(Clients *cs, void *buf, int len);
+extern int send_status(Clients *cs, char *msg);
+extern void send_history(History *h, Client *c);
+extern void send_vt102(VT102 *v, Client *c);
 
-#endif /* __CLIENTS_H__ */
+#endif
diff --git a/apps/sympathyd.c b/apps/sympathyd.c
index 8f45ca5..49dd312 100644
--- a/apps/sympathyd.c
+++ b/apps/sympathyd.c
@@ -11,6 +11,9 @@ static char rcsid[] =
 
 /*
  * $Log$
+ * Revision 1.8  2008/02/14 10:34:30  james
+ * *** empty log message ***
+ *
  * Revision 1.7  2008/02/14 02:46:44  james
  * *** empty log message ***
  *
@@ -34,47 +37,219 @@ static char rcsid[] =
  *
  */
 
+#include <sys/time.h>
 #include <sympathy.h>
 
 #include "client.h"
 #include "clients.h"
 
+typedef struct
+{
+  int nclients;
+  int lines;
+  int baud;
+  int crtscts;
+  int cd_edge_sec;
+  int bootstrap;
+} Status;
+
+static Status
+get_status (TTY * t, Clients * cs)
+{
+  static struct timeval last_cd_edge = { 0 };
+  static int last_cd_state = -1;
+  int cd;
+  struct timeval now, dif;
+
+  TTY_Status tty_status = { 0 };
+  Status status;
+
+  tty_get_status (t, &tty_status);
+
+  status.bootstrap = 1;
+  status.nclients = cs->n;
+  status.lines = tty_status.lines;
+  status.baud = tty_status.baud;
+  status.crtscts = (tty_status.termios.c_cflag & CRTSCTS) ? 1 : 0;
+
+  cd = (tty_status.lines & TIOCM_CD) ? 1 : 0;
+
+  if (cd != last_cd_state)
+    {
+      gettimeofday (&last_cd_edge, NULL);
+      last_cd_state = cd;
+    }
+
+  gettimeofday (&now, NULL);
+  timersub (&now, &last_cd_edge, &dif);
+  status.cd_edge_sec = dif.tv_sec;
+
+  return status;
+}
+
+static char *
+line_to_name (int l)
+{
+
+  switch (l)
+    {
+#ifdef TIOCM_LE
+    case TIOCM_LE:
+      return "LE";
+#endif
+#ifdef TIOCM_DTR
+    case TIOCM_DTR:
+      return "DTR";
+#endif
+#ifdef TIOCM_RTS
+    case TIOCM_RTS:
+      return "RTS";
+#endif
+#ifdef TIOCM_ST
+    case TIOCM_ST:
+      return "ST";
+#endif
+#ifdef TIOCM_SR
+    case TIOCM_SR:
+      return "SR";
+#endif
+#ifdef TIOCM_CTS
+    case TIOCM_CTS:
+      return "CTS";
+#endif
+#ifdef TIOCM_CD
+    case TIOCM_CD:
+      return "CD";
+#endif
+#ifdef TIOCM_RI
+    case TIOCM_RI:
+      return "RI";
+#endif
+#ifdef TIOCM_DSR
+    case TIOCM_DSR:
+      return "DSR";
+#endif
+    }
+  return "??";
+}
 
 static void
-send_history (History * h, Client * c)
+log_line_changes (Context * ctx, int old, int new)
 {
-  int rptr = h->wptr;
+  int dif = old ^ new;
+  int c = 1;
+  char buf[1024], *ptr = buf;
+  char *n;
 
-  HISTORY_INC (h, rptr);
+  if (!dif)
+    return;
+  if (!ctx->l)
+    return;
 
-  HISTORY_INC (h, rptr);
-  while (rptr != h->wptr)
-    {
-      History_ent *l = &h->lines[rptr];
-      if (l->valid)
-        {
+  n = "<Modem lines changed:";
 
-          if (ipc_msg_send_history (c->s, l))
-            c->dead++;
+  while (*n)
+    *(ptr++) = *(n++);
+
+  while (dif >= c)
+    {
 
+      if (dif & c)
+        {
+          *(ptr++) = ' ';
+          *(ptr++) = (new & c) ? '+' : '-';
+          n = line_to_name (c);
+          while (*n)
+            *(ptr++) = *(n++);
         }
-      HISTORY_INC (h, rptr);
+
+      c <<= 1;
     }
+  *(ptr++) = '>';
+  *ptr = 0;
+
+
+  ctx->l->log (ctx->l, buf);
+
 }
 
+static char *
+do_line (char *ptr,int lines, int line)
+{
+  char *lname;
+
+  if (!(lines & line))
+    return ptr;
+  lname = line_to_name (line);
+
+  while (*lname)
+    *(ptr++) = *(lname++);
+
+  return ptr;
+}
+
+
+
 static void
-send_vt102 (VT102 * v, Client * c)
+check_status (Context * c, Clients * cs)
 {
-  if (ipc_msg_send_vt102 (c->s, v))
-    c->dead++;
+  static Status old_status = { 0 };
+  Status status;
+  char buf[1024];
+  char *ptr = buf;
+  char *t;
+
+  status = get_status (c->t, cs);
+  if (!memcmp (&status, &old_status, sizeof (status)))
+    return;
+  old_status = status;
+
+
+  log_line_changes (c, old_status.lines, status.lines);
+
+  t=c->t->name;
+  if (!strncmp(t,"/dev/",5)) t+=5;
+  while (*t)
+    *(ptr++) = *(t++);
 
+  ptr += sprintf (ptr, " %db", status.baud);
+
+  ptr = do_line (ptr, status.lines, TIOCM_RTS);
+  ptr = do_line (ptr, status.lines, TIOCM_CTS);
+  ptr = do_line (ptr, status.lines, TIOCM_DTR);
+  ptr = do_line (ptr, status.lines, TIOCM_DSR);
+  ptr = do_line (ptr, status.lines, TIOCM_RI);
+
+  if (status.crtscts) {
+ 	t=", Flow";
+  while (*t)
+    *(ptr++) = *(t++);
+    }
+ 
+  if (status.lines & TIOCM_CD)
+    {
+      ptr +=
+        sprintf (ptr, ", On %d.%d", status.cd_edge_sec / 60,
+                 status.cd_edge_sec % 60);
+    }
+  else
+    {
+      ptr +=
+        sprintf (ptr, ", Off %d.%d", status.cd_edge_sec / 60,
+                 status.cd_edge_sec % 60);
+    }
+
+  ptr += sprintf (ptr, ", %d client%s", status.nclients,(status.nclients==1) ? "":"s");
+
+  *ptr = 0;
+
+  send_status (cs, buf);
 }
 
 int
 main (int argc, char *argv[])
 {
   fd_set rfds, wfds;
-//  ANSI a = { 0 };
   Context c;
   Socket *s, *cs;
   Clients *clients;
@@ -88,26 +263,19 @@ main (int argc, char *argv[])
   c.l = file_log_new ("log");
   c.k = keydis_vt102_new (&c);
 
-#if 0
-  terminal_register_handlers ();
-  a.terminal = terminal_open (0, 1);
-
-  ansi_reset (&a, NULL);
-#endif
 
   clients = clients_new ();
 
   for (;;)
     {
-      struct timeval tv = { 10, 0 };
+      struct timeval tv = { 1, 0 };
+
+      check_status (&c, clients);
 
       FD_ZERO (&rfds);
       FD_ZERO (&wfds);
 
       tty_pre_select (c.t, &rfds, &wfds);
-#if 0
-      tty_pre_select (a.terminal, &rfds, &wfds);
-#endif
 
       FD_SET (s->fd, &rfds);
 
@@ -145,23 +313,16 @@ main (int argc, char *argv[])
 
           if (red)
             {
-              clients_output (clients, buf, red);
+              send_output (clients, buf, red);
               vt102_parse (&c, buf, red);
             }
         }
 
-#if 0
-      ansi_dispatch (&a, &c);
-      ansi_update (&a, &c);
-#endif
 
 
     }
 
   clients_shutdown (clients);
-#if 0
-  ansi_terminal_reset (&a);
-#endif
   terminal_atexit ();
   printf ("QUAT\n");
 }
diff --git a/src/prototypes.h b/src/prototypes.h
index 28cffac..3fca7af 100644
--- a/src/prototypes.h
+++ b/src/prototypes.h
@@ -73,6 +73,7 @@ extern VT102 *vt102_new(void);
 extern void vt102_free(VT102 *v);
 /* tty.c */
 extern void tty_pre_select(TTY *t, fd_set *rfds, fd_set *wfds);
+extern int tty_get_status(TTY *t, TTY_Status *s);
 /* keydis.c */
 extern KeyDis *keydis_vt102_new(Context *c);
 extern KeyDis *keydis_ipc_new(Socket *s);
@@ -113,6 +114,7 @@ extern int ipc_msg_send_history(Socket *s, History_ent *l);
 extern int ipc_msg_send_vt102(Socket *s, VT102 *v);
 extern int ipc_msg_send_key(Socket *s, int key);
 extern int ipc_msg_send_term(Socket *s, void *buf, int len);
+extern int ipc_msg_send_status(Socket *s, char *buf);
 /* slide.c */
 extern void slide_free(Slide *s);
 extern void slide_consume(Slide *s, int n);
diff --git a/src/tty.c b/src/tty.c
index ca4936b..fb60246 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.7  2008/02/14 10:34:30  james
+ * *** empty log message ***
+ *
  * Revision 1.6  2008/02/13 16:59:34  james
  * *** empty log message ***
  *
@@ -27,12 +30,198 @@ static char rcsid[] = "$Id$";
 
 #include "project.h"
 
+static int
+speed_t_to_baud (speed_t s)
+{
+  switch (s)
+    {
+#ifdef B0
+    case B0:
+      return 0;
+#endif
+#ifdef B50
+    case B50:
+      return 50;
+#endif
+#ifdef B75
+    case B75:
+      return 75;
+#endif
+#ifdef B110
+    case B110:
+      return 110;
+#endif
+#ifdef B134
+    case B134:
+      return 134;
+#endif
+#ifdef B150
+    case B150:
+      return 150;
+#endif
+#ifdef B200
+    case B200:
+      return 200;
+#endif
+#ifdef B300
+    case B300:
+      return 300;
+#endif
+#ifdef B600
+    case B600:
+      return 600;
+#endif
+#ifdef B1200
+    case B1200:
+      return 1200;
+#endif
+#ifdef B1800
+    case B1800:
+      return 1800;
+#endif
+#ifdef B2400
+    case B2400:
+      return 2400;
+#endif
+#ifdef B4800
+    case B4800:
+      return 4800;
+#endif
+#ifdef B9600
+    case B9600:
+      return 9600;
+#endif
+#ifdef B19200
+    case B19200:
+      return 19200;
+#endif
+#ifdef B38400
+    case B38400:
+      return 38400;
+#endif
+#ifdef B57600
+    case B57600:
+      return 57600;
+#endif
+#ifdef B115200
+    case B115200:
+      return 115200;
+#endif
+#ifdef B230400
+    case B230400:
+      return 230400;
+#endif
+    }
+
+  return -1;
+}
+
+static speed_t
+baud_to_speed_t (int baud)
+{
+  switch (baud)
+    {
+#ifdef B0
+    case 0:
+      return B0;
+#endif
+#ifdef B50
+    case 50:
+      return B50;
+#endif
+#ifdef B75
+    case 75:
+      return B75;
+#endif
+#ifdef B110
+    case 110:
+      return B110;
+#endif
+#ifdef B134
+    case 134:
+      return B134;
+#endif
+#ifdef B150
+    case 150:
+      return B150;
+#endif
+#ifdef B200
+    case 200:
+      return B200;
+#endif
+#ifdef B300
+    case 300:
+      return B300;
+#endif
+#ifdef B600
+    case 600:
+      return B600;
+#endif
+#ifdef B1200
+    case 1200:
+      return B1200;
+#endif
+#ifdef B1800
+    case 1800:
+      return B1800;
+#endif
+#ifdef B2400
+    case 2400:
+      return B2400;
+#endif
+#ifdef B4800
+    case 4800:
+      return B4800;
+#endif
+#ifdef B9600
+    case 9600:
+      return B9600;
+#endif
+#ifdef B19200
+    case 19200:
+      return B19200;
+#endif
+#ifdef B38400
+    case 38400:
+      return B38400;
+#endif
+#ifdef B57600
+    case 57600:
+      return B57600;
+#endif
+#ifdef B115200
+    case 115200:
+      return B115200;
+#endif
+#ifdef B230400
+    case 230400:
+      return B230400;
+#endif
+    }
+  return -1;
+}
+
 void
 tty_pre_select (TTY * t, fd_set * rfds, fd_set * wfds)
 {
   FD_SET (t->rfd, rfds);
 }
 
+int
+tty_get_status (TTY * t, TTY_Status * s)
+{
+
+	s->lines=0;
+  ioctl (t->rfd, TIOCMGET, &s->lines);
+
+  if (tcgetattr (t->rfd, &s->termios))
+    return -1;
+ 
+  s->baud=speed_t_to_baud(cfgetispeed(&s->termios));
+
+  return 0;
+}
+
 #if 0
 int
 tty_post_select (Context * c, fd_set * rfds, fd_set * wfds)
diff --git a/src/tty.h b/src/tty.h
index 91b14c6..5286c28 100644
--- a/src/tty.h
+++ b/src/tty.h
@@ -12,6 +12,9 @@
 
 /*
  * $Log$
+ * Revision 1.6  2008/02/14 10:34:30  james
+ * *** empty log message ***
+ *
  * Revision 1.5  2008/02/13 09:12:21  james
  * *** empty log message ***
  *
@@ -46,4 +49,10 @@ typedef struct TTY_struct
   TTY_SIGNATURE;
 } TTY;
 
+typedef struct {
+  int lines;
+  struct termios termios;
+  int baud;
+} TTY_Status;
+
 #endif /* __TTY_H__ */