diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile.am | 7 | ||||
| -rw-r--r-- | apps/client.c | 134 | ||||
| -rw-r--r-- | apps/client.h | 32 | ||||
| -rw-r--r-- | apps/mainloop.h | 29 | ||||
| -rw-r--r-- | apps/sympathy.c | 11 | ||||
| -rw-r--r-- | apps/sympathyd.c | 369 |
6 files changed, 41 insertions, 541 deletions
diff --git a/apps/Makefile.am b/apps/Makefile.am index f81709b..513e8ad 100644 --- a/apps/Makefile.am +++ b/apps/Makefile.am @@ -7,6 +7,9 @@ # $Id$ # # $Log$ +# Revision 1.10 2008/02/20 18:35:10 james +# *** empty log message *** +# # Revision 1.9 2008/02/20 18:33:37 james # *** empty log message *** # @@ -39,9 +42,9 @@ INCLUDES = -I$(srcdir)/../src -noinst_PROGRAMS = sympathyd sympathy +bin_PROGRAMS = sympathy -noinst_HEADERS=clients.h client.h +noinst_HEADERS=clients.h mainloop.h sympathy_SOURCES = sympathy.c usage.c clients.c mainloop.c sympathy_LDADD = ../src/libsympathy.la -lutil diff --git a/apps/client.c b/apps/client.c deleted file mode 100644 index 93ade70..0000000 --- a/apps/client.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * client.c: - * - * Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>, - * All rights reserved. - * - */ - -static char rcsid[] = "$Id$"; - -/* - * $Log$ - * Revision 1.6 2008/02/15 03:32:07 james - * *** empty log message *** - * - * Revision 1.5 2008/02/14 10:34:47 james - * *** empty log message *** - * - * 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 *** - * - * Revision 1.2 2008/02/14 00:57:58 james - * *** empty log message *** - * - * Revision 1.1 2008/02/13 18:05:06 james - * *** empty log message *** - * - */ - -#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) -{ - switch (m->hdr.type) - { - - case IPC_MSG_TYPE_NOOP: - break; - case IPC_MSG_TYPE_DEBUG: -// fprintf (stderr,"%p [%d] %s\n", m, m->hdr.size , m->debug.msg ); - break; - case IPC_MSG_TYPE_HISTORY: - history_add (c->h, m->history.history.line); - break; - case IPC_MSG_TYPE_VT102: - if (sizeof (VT102) != m->vt102.len) - abort (); - - *(c->v) = m->vt102.vt102; - break; - case IPC_MSG_TYPE_TERM: - vt102_parse (c, m->term.term, m->term.len); - break; - case IPC_MSG_TYPE_STATUS: - cmd_new_status (c->d, c, m->status.status); - break; - default: - fprintf (stderr, "Unhandeled message type %d\n", m->hdr.type); - } -} - -void -client (void) -{ - Socket *s; - fd_set rfds, wfds; - - ANSI a = { 0 }; - Context c; - - - s = socket_connect ("socket"); - - if (!s) - { - printf ("no socket"); - return; - } - - c.t = NULL; - c.v = vt102_new (); - c.h = history_new (200); - c.l = NULL; - c.k = keydis_ipc_new (s); - c.d = cmd_new (); - - terminal_register_handlers (); - a.terminal = terminal_open (0, 1); - - ansi_reset (&a, NULL); - - for (;;) - { - struct timeval tv = { 0, 100000 }; - - if (c.d->disconnect) - break; - - FD_ZERO (&rfds); - FD_ZERO (&wfds); - - socket_pre_select (s, &rfds, &wfds); - tty_pre_select (a.terminal, &rfds, &wfds); - - select (FD_SETSIZE, &rfds, &wfds, NULL, &tv); - - if (socket_post_select (s, &rfds, &wfds)) - break; - - while (s->msg) - { - server_msg (s->msg, &c); - socket_consume_msg (s); - } - - if (ansi_dispatch (&a, &c)) - break; - - ansi_update (&a, &c); - - } - ansi_terminal_reset (&a); - terminal_atexit (); - printf ("QUAT\n"); - - -} diff --git a/apps/client.h b/apps/client.h deleted file mode 100644 index d3b650d..0000000 --- a/apps/client.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * client.h: - * - * Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>, - * All rights reserved. - * - */ - -/* - * $Id$ - */ - -/* - * $Log$ - * Revision 1.3 2008/02/14 02:46:44 james - * *** empty log message *** - * - * Revision 1.2 2008/02/14 00:57:58 james - * *** empty log message *** - * - * Revision 1.1 2008/02/13 18:05:06 james - * *** empty log message *** - * - */ - -#ifndef __CLIENT_H__ -#define __CLIENT_H__ - -void client (void); - - -#endif /* __CLIENT_H__ */ diff --git a/apps/mainloop.h b/apps/mainloop.h new file mode 100644 index 0000000..23d6e12 --- /dev/null +++ b/apps/mainloop.h @@ -0,0 +1,29 @@ +/* + * mainloop.h: + * + * Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>, + * All rights reserved. + * + */ + +/* + * $Id$ + */ + +/* + * $Log$ + * Revision 1.1 2008/02/20 18:33:37 james + * *** empty log message *** + * + */ + +#ifndef __MAINLOOP_H__ +#define __MAINLOOP_H__ + +#include <sympathy.h> + +void +mainloop (TTY * tty, Socket * server_socket, Socket * client_socket, ANSI * a, + Log * log, int nhistory); + +#endif /* __MAINLOOP_H__ */ diff --git a/apps/sympathy.c b/apps/sympathy.c index 29cf0ac..a754b3d 100644 --- a/apps/sympathy.c +++ b/apps/sympathy.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.8 2008/02/20 18:33:37 james + * *** empty log message *** + * * Revision 1.7 2008/02/20 18:31:44 james * *** empty log message *** * @@ -303,11 +306,11 @@ main (int argc, char *argv[]) if (oflags['n']) { - nhistory = safe_atoi (oargs['n']); - if (nhistory < 0) + history = safe_atoi (oargs['n']); + if (history < 0) fatal_moan ("cannot parse -n %s as an integer", oargs['n']); - if (!nhistory) + if (!history) fatal_moan ("agrument to -n must be greater than zero"); } @@ -468,7 +471,7 @@ main (int argc, char *argv[]) } } - mainloop (tty, server_socket, client_socket, ansi, log, nhistory); + mainloop (tty, server_socket, client_socket, ansi, log, history); if (ansi) { diff --git a/apps/sympathyd.c b/apps/sympathyd.c deleted file mode 100644 index 65ef1f9..0000000 --- a/apps/sympathyd.c +++ /dev/null @@ -1,369 +0,0 @@ -/* - * sympathy.c: - * - * Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>, - * All rights reserved. - * - */ - -static char rcsid[] = - "$Id$"; - -/* - * $Log$ - * Revision 1.13 2008/02/15 23:52:12 james - * *** empty log message *** - * - * Revision 1.12 2008/02/15 03:32:07 james - * *** empty log message *** - * - * Revision 1.11 2008/02/14 16:21:17 james - * *** empty log message *** - * - * Revision 1.10 2008/02/14 10:39:14 james - * *** empty log message *** - * - * Revision 1.9 2008/02/14 10:34:47 james - * *** empty log message *** - * - * 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 *** - * - * Revision 1.6 2008/02/14 00:57:58 james - * *** empty log message *** - * - * Revision 1.5 2008/02/13 18:05:06 james - * *** empty log message *** - * - * Revision 1.4 2008/02/13 17:21:55 james - * *** empty log message *** - * - * Revision 1.3 2008/02/08 15:06:52 james - * *** empty log message *** - * - * Revision 1.2 2008/02/07 15:42:49 james - * *** empty log message *** - * - * Revision 1.1 2008/02/05 14:25:49 james - * *** empty log message *** - * - */ - -#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 blocked; - 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; - status.blocked = tty_status.blocked; - - 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 -log_line_changes (Context * ctx, int old, int new) -{ - int dif = old ^ new; - int c = 1; - char buf[1024], *ptr = buf; - char *n; - - if (!dif) - return; - if (!ctx->l) - return; - - n = "<Modem lines changed:"; - - while (*n) - *(ptr++) = *(n++); - - while (dif >= c) - { - - if (dif & c) - { - *(ptr++) = ' '; - *(ptr++) = (new & c) ? '+' : '-'; - n = line_to_name (c); - while (*n) - *(ptr++) = *(n++); - } - - 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); - - *(ptr++) = ' '; - while (*lname) - *(ptr++) = *(lname++); - - return ptr; -} - - - -static void -check_status (Context * c, Clients * cs) -{ - 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); - - ptr += sprintf (ptr, "CTRL-B "); - - 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); - ptr = do_line (ptr, status.lines, TIOCM_CD); - - if (status.blocked) - { - t = ", Locked"; - while (*t) - *(ptr++) = *(t++); - } - - if (status.crtscts) - { - t = ", Flow"; - while (*t) - *(ptr++) = *(t++); - } - -#if 0 - 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); - } -#endif - - 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; - Context c; - Socket *s, *cs; - Clients *clients; - - -#if 0 - construct_possible_lock_files ("/dev/modem"); - return 0; -#endif - - s = socket_listen ("socket"); - -// c.t = ptty_open (NULL, NULL); - c.t = serial_open ("/dev/cellmodem", 0); - c.v = vt102_new (); - c.h = history_new (200); - c.l = file_log_new ("log"); - c.k = keydis_vt102_new (); - c.d = NULL; - - - clients = clients_new (); - - for (;;) - { - struct timeval tv = { 1, 0 }; - - check_status (&c, clients); - - FD_ZERO (&rfds); - FD_ZERO (&wfds); - - tty_pre_select (c.t, &rfds, &wfds); - - FD_SET (s->fd, &rfds); - - socket_pre_select (s, &rfds, &wfds); - - clients_pre_select (clients, &rfds, &wfds); - - select (FD_SETSIZE, &rfds, &wfds, NULL, &tv); - - if (FD_ISSET (s->fd, &rfds) && ((cs = socket_accept (s)))) - { - { - Client *cl; - /*New client connexion */ - cl = clients_new_client (clients, cs, &c); - - send_history (c.h, cl); - send_vt102 (c.v, cl); - - } - } - - - clients_post_select (clients, &c, &rfds, &wfds); - - if (FD_ISSET (c.t->rfd, &rfds)) - { - char buf[IPC_MAX_BUF]; - int red; - - red = c.t->recv (c.t, buf, sizeof (buf)); - - if (red < 0) - break; - - if (red) - { - send_output (clients, buf, red); - vt102_parse (&c, buf, red); - } - } - - - - } - - clients_shutdown (clients); - terminal_atexit (); - printf ("QUAT\n"); -} |