[lcd4linux @ 2003-10-12 06:08:28 by nicowallmeier]

imond/telmond support

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@266 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/Makefile.am b/Makefile.am
index e5b17f2fac35371ac2d896e66b3c2763e60f15b2..331b33fd87bc7b52ebce881eb85d0523b28cfb9d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,8 @@ filter.c filter.h \
 widget.c widget.h \
 exec.c exec.h \
 mail2.c \
-socket.c socket.h
+socket.c socket.h \
+imon.c imon.h
 
 liblcd4linux_la_DEPENDENCIES = @DRIVERS@
 liblcd4linux_la_LDFLAGS = -version-info 9:11:9

diff --git a/imon.c b/imon.c
new file mode 100755 (executable)
index 0000000..4f70ac0
--- /dev/null
+++ b/imon.c
@@ -0,0 +1,442 @@
+/* $Id: imon.c,v 1.1 2003/10/12 06:08:28 nicowallmeier Exp $
+ *
+ * imond/telmond data processing
+ *
+ * This file is part of LCD4Linux.
+ *
+ * LCD4Linux is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * LCD4Linux is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *
+ * $Log: imon.c,v $
+ * Revision 1.1  2003/10/12 06:08:28  nicowallmeier
+ * imond/telmond support
+ *
+ */
+\r
+#include <stdio.h>\r
+#include <string.h>\r
+#include <unistd.h>\r
+#include <stdlib.h>\r
+#include <sys/types.h>\r
+#include <sys/fcntl.h>\r
+#include <sys/ioctl.h>\r
+#include <sys/time.h>\r
+#include <linux/errno.h>\r
+#include <sys/stat.h>\r
+#include <string.h>\r
+#include <time.h>\r
+\r
+#include <netdb.h>\r
+#include <netinet/in.h>\r
+#include <netinet/tcp.h>\r
+#include <arpa/inet.h>                          /* decl of inet_addr()      */\r
+#include <sys/socket.h>\r
+\r
+#include "cfg.h"\r
+#include "debug.h"\r
+#include "parser.h"\r
+#include "imon.h"\r
+\r
+#define TRUE                        1\r
+#define FALSE                       0\r
+\r
+static int      fd;\r
+\r
+ /*----------------------------------------------------------------------------\r
+ *  service_connect (host_name, port)       - connect to tcp-service\r
+ *----------------------------------------------------------------------------\r
+ */\r
+static int\r
+service_connect (char * host_name, int port)\r
+{\r
+    struct sockaddr_in  addr;\r
+    struct hostent *    host_p;\r
+    int                 fd;\r
+    int                 opt = 1;\r
+\r
+    (void) memset ((char *) &addr, 0, sizeof (addr));\r
+\r
+    if ((addr.sin_addr.s_addr = inet_addr ((char *) host_name)) == INADDR_NONE)\r
+    {\r
+        host_p = gethostbyname (host_name);\r
+\r
+        if (! host_p)\r
+        {\r
+            error ("%s: host not found\n", host_name);\r
+            return (-1);\r
+        }\r
+\r
+        (void) memcpy ((char *) (&addr.sin_addr), host_p->h_addr,\r
+                        host_p->h_length);\r
+    }\r
+\r
+    addr.sin_family  = AF_INET;\r
+    addr.sin_port    = htons ((unsigned short) port);\r
+\r
+    if ((fd = socket (AF_INET, SOCK_STREAM, 0)) < 0)\r
+    {                                           /* open socket              */\r
+        perror ("socket");\r
+        return (-1);\r
+    }\r
+    \r
+    (void) setsockopt (fd, IPPROTO_TCP, TCP_NODELAY,\r
+                       (char *) &opt, sizeof (opt));\r
+\r
+    if (connect (fd, (struct sockaddr *) &addr, sizeof (addr)) != 0)\r
+    {\r
+        (void) close (fd);\r
+        perror (host_name);\r
+        return (-1);\r
+    }\r
+\r
+    return (fd);\r
+} /* service_connect (char * host_name, int port) */\r
+\r
+\r
+/*----------------------------------------------------------------------------\r
+ *  send_command (int fd, char * str)       - send command to imond\r
+ *----------------------------------------------------------------------------\r
+ */\r
+static void\r
+send_command (int fd, char * str)\r
+{\r
+    char    buf[256];\r
+    int     len = strlen (str);\r
+\r
+    sprintf (buf, "%s\r\n", str);\r
+    write (fd, buf, len + 2);\r
+\r
+    return;\r
+} /* send_command (int fd, char * str) */\r
+\r
+\r
+/*----------------------------------------------------------------------------\r
+ *  get_answer (int fd)                     - get answer from imond\r
+ *----------------------------------------------------------------------------\r
+ */\r
+static char *\r
+get_answer (int fd)\r
+{\r
+    static char buf[8192];\r
+    int         len;\r
+\r
+    len = read (fd, buf, 8192);\r
+\r
+    if (len <= 0)\r
+    {\r
+        return ((char *) NULL);\r
+    }\r
+\r
+    while (len > 1 && (buf[len - 1] == '\n' || buf[len - 1] == '\r'))\r
+    {\r
+        buf[len - 1] = '\0';\r
+        len--;\r
+    }\r
+\r
+    if (! strncmp (buf, "OK ", 3))                      /* OK xxxx          */\r
+    {\r
+        return (buf + 3);\r
+    }\r
+    else if (len > 2 && ! strcmp (buf + len - 2, "OK"))\r
+    {\r
+        *(buf + len - 2) = '\0';\r
+        return (buf);\r
+    }\r
+    else if (len == 2 && ! strcmp (buf + len - 2, "OK"))\r
+    {\r
+        return (buf);\r
+    }\r
+\r
+    return ((char *) NULL);                             /* ERR xxxx         */\r
+} /* get_answer (int fd) */\r
+\r
+\r
+/*----------------------------------------------------------------------------\r
+ *  get_numerical_value (char * cmd)   - send cmd, get numval\r
+ *----------------------------------------------------------------------------\r
+ */\r
+static int\r
+get_numerical_value (char * cmd)\r
+{\r
+    char *  answer;\r
+    int     rtc;\r
+\r
+    send_command (fd, cmd);\r
+\r
+    answer = get_answer (fd);\r
+\r
+    if (answer)\r
+    {\r
+        rtc = atoi (answer);\r
+    }\r
+    else\r
+    {\r
+        rtc = -1;\r
+    }\r
+    return (rtc);\r
+} /* get_numerical_value (char * cmd, int arg) */\r
+\r
+\r
+/*----------------------------------------------------------------------------\r
+ *  get_value (char * cmd)         - send command, get value\r
+ *----------------------------------------------------------------------------\r
+ */\r
+static char *\r
+get_value (char * cmd)\r
+{\r
+    char *  answer;\r
+\r
+    send_command (fd, cmd);\r
+\r
+    answer = get_answer (fd);\r
+\r
+    if (answer)\r
+    {\r
+        return (answer);\r
+    }\r
+\r
+    return ("");\r
+} /* get_value (char * cmd, int arg) */\r
+\r
+\r
+int init(){\r
+ char *s, *host;\r
+ int port;\r
+ int connect;\r
+\r
+ host=cfg_get ("Imon_Host","127.0.0.1");\r
+ if (*host=='\0') {\r
+  error ("Imon: no 'Imon_Host' entry in %s", cfg_source());\r
+  return -1;\r
+ } \r
+\r
+ if (cfg_number("Imon_Port",5000,1,65536,&port)<0){\r
+   return -1;  \r
+ }\r
+ \r
+ connect=service_connect(host,port);\r
+\r
+ s=cfg_get ("Imon_Pass",NULL);\r
+ if ((s!=NULL) && (*s!='\0')) { // Passwort senden\r
+   char buf[40];\r
+   sprintf(buf,"pass %s",s);\r
+   send_command(connect,buf);\r
+   s=get_answer(connect); \r
+ }\r
+ \r
+ return connect;       \r
+}\r
+ \r
+int ImonCh(int index, struct imonchannel *ch, int token_usage[]) {\r
+ static int err[CHANNELS+1];\r
+ char *s;\r
+ char buf[40];\r
+ int result=0;\r
+ \r
+ if (err[index]) return -1;\r
+ if ((fd==0) && ((fd=init())<0)) return -1;\r
+        \r
+ if ((*ch).max_in == 0){ // not initializied\r
+  sprintf(buf, "Imon_%d_Dev", index);\r
+  s=cfg_get(buf,NULL);\r
+  if (s==NULL) {\r
+   error ("Imon: no 'Imon_%i_Dev' entry in %s", index, cfg_source());\r
+   err[index]=1;\r
+   return -1;\r
+  } \r
+  strcpy((*ch).dev,s);\r
+  \r
+  sprintf(buf, "Imon_%d_MaxIn", index);\r
+  cfg_number(buf,768,1,65536,&(*ch).max_in);\r
+\r
+  sprintf(buf, "Imon_%d_MaxOut", index);\r
+  cfg_number(buf,128,1,65536,&(*ch).max_out);\r
+ }\r
+\r
+ sprintf(buf, "status %s", (*ch).dev);\r
+ s=get_value(buf);\r
+ strcpy((*ch).status,s);\r
+ \r
+ if ((1<<index) & token_usage[T_IMON_CHARGE]) {\r
+   sprintf(buf, "charge %s", (*ch).dev);\r
+   s=get_value(buf);\r
+   strcpy((*ch).charge,s);\r
+ }\r
+    \r
+ \r
+ if (strcmp("Online",(*ch).status)==0){\r
+   if ((1<<index) & token_usage[T_IMON_PHONE]) {\r
+     sprintf(buf, "phone %s", (*ch).dev);\r
+     s=get_value(buf);\r
+     strcpy((*ch).phone,s);\r
+   }\r
+\r
+   if (((1<<index) & token_usage[T_IMON_RIN]) ||\r
+       ((1<<index) & token_usage[T_IMON_ROUT])) {\r
+     sprintf(buf, "rate %s", (*ch).dev);\r
+     s=get_value(buf);\r
+     if (sscanf(s,"%d %d",&((*ch).rate_in), &((*ch).rate_out))!=2) result--;\r
+   }\r
+   \r
+   if ((1<<index) & token_usage[T_IMON_IP]) {\r
+     sprintf(buf, "ip %s", (*ch).dev);\r
+     s=get_value(buf);\r
+     strcpy((*ch).ip,s);\r
+   }\r
+   \r
+   if ((1<<index) & token_usage[T_IMON_OTIME]) {\r
+        sprintf(buf, "online-time %s", (*ch).dev);\r
+     s=get_value(buf);\r
+     strcpy((*ch).otime,s);\r
+   }\r
+ } else {\r
+   if (strcmp("Dialing",(*ch).status)==0){\r
+     if ((1<<index) & token_usage[T_IMON_PHONE]) {\r
+       sprintf(buf, "phone %s", (*ch).dev);\r
+       s=get_value(buf);\r
+       strcpy((*ch).phone,s);\r
+     }\r
+   } else {\r
+     if ((1<<index) & token_usage[T_IMON_PHONE]) (*ch).phone[0]='\0';\r
+   }\r
+   if ((1<<index) & token_usage[T_IMON_IP]) (*ch).ip[0]='\0';  \r
+   if ((1<<index) & token_usage[T_IMON_OTIME]) (*ch).otime[0]='\0';\r
+   if (((1<<index) & token_usage[T_IMON_RIN]) ||\r
+       ((1<<index) & token_usage[T_IMON_ROUT])) {\r
+        (*ch).rate_in=0;\r
+     (*ch).rate_out=0; \r
+   }\r
+ }\r
+ return result;\r
+} \r
+ \r
+ \r
+int Imon(struct imon *i, int cpu, int datetime){\r
+ static int hb;\r
+ static int tick;\r
+ char *s;\r
+ char day[4];\r
+ char d[13];\r
+ \r
+ if (tick++ % 5 != 0) return 0;\r
+ \r
+ if ((fd==0) && ((fd=init())<0)) return -1;\r
+ \r
+ if (cpu) (*i).cpu = get_numerical_value("cpu");\r
+\r
+ if (datetime){ \r
+   s = get_value ("date");\r
+   sscanf (s, "%s %s %s", day, d, (*i).time);\r
+   strncpy ((*i).date, d, 6);\r
+   strcpy ((*i).date + 6, d + 8);\r
+   (*i).date[2]='.';\r
+   (*i).date[5]='.';\r
+   if (hb) (*i).time[5] =' ';\r
+   hb=!hb;\r
+ }\r
+ return 0;\r
+}\r
+\r
+char* ImonVer(){\r
+  static char buffer[32]="";\r
+\r
+  if (*buffer=='\0') {\r
+   char *s;\r
+   if ((fd==0) && ((fd=init())<0)) return "";\r
+   s=get_value("version");\r
+   for (;;){ // interne Versionsnummer killen\r
+       if (s[0]==' '){\r
+     s=s+1;\r
+     break;\r
+    }\r
+    s=s+1;             \r
+   }\r
+   strcpy(buffer,s);  \r
+  }\r
+  return buffer;\r
+}\r
+\r
+void phonebook(char *number){\r
+  FILE *  fp;\r
+  char line[256];\r
+  \r
+  fp = fopen (cfg_get ("Telmon_Phonebook","/etc/phonebook"), "r");\r
+  \r
+  if (! fp) return;\r
+  \r
+  while (fgets (line, 128, fp)){\r
+       if (*line == '#') continue;\r
+       if (!strncmp(line,number,strlen(number))){\r
+         char *komma=strchr(line,',');\r
+         char *beginn=strchr(line,'=');\r
+         if (!beginn) return;\r
+         while (strrchr(line,'\r')) strrchr(line,'\r')[0]='\0';\r
+         while (strrchr(line,'\n')) strrchr(line,'\n')[0]='\0';\r
+         if (komma) komma[0]='\0';\r
+         strcpy(number,beginn+1);\r
+         break;\r
+       }       \r
+  }\r
+  \r
+  fclose(fp);\r
+}\r
+\r
+int Telmon(struct telmon *t){\r
+ static int tick;\r
+ static int telmond_fd=-2;\r
+ static char oldanswer[128];\r
+ static char host[256];\r
+ static int port;\r
+ \r
+ if (tick++ % 50 != 0) return 0;\r
+\r
+ if (telmond_fd == -2){ //not initializied\r
+  char *s=cfg_get ("Telmon_Host","127.0.0.1");\r
+  if (*s=='\0') {\r
+   error ("Telmon: no 'Telmon_Host' entry in %s", cfg_source());\r
+   telmond_fd=-1;\r
+   return -1;\r
+  } \r
+  strcpy(host,s);\r
+  \r
+  if (cfg_number("Telmon_Port",5000,1,65536,&port)<0){\r
+   telmond_fd=-1;\r
+   return -1;  \r
+  }\r
+ }\r
+ \r
+ if (telmond_fd != -1){\r
+  char    telbuf[128];\r
+\r
+  telmond_fd = service_connect (host, port);\r
+  if (telmond_fd >= 0){\r
+   int l = read (telmond_fd, telbuf, 127);\r
+   if ((l > 0) && (strcmp(telbuf,oldanswer))){\r
+       char date[11]; \r
+       sscanf(telbuf,"%s %s %s %s",date,(*t).time,(*t).number,(*t).msn);\r
+       date[4]='\0';\r
+       date[7]='\0';\r
+       sprintf((*t).date,"%s.%s.%s",date+8,date+5,date);\r
+       phonebook((*t).number);\r
+       phonebook((*t).msn);\r
+   }\r
+   close (telmond_fd);\r
+   strcpy(oldanswer,telbuf);\r
+  }\r
+ }\r
+ return 0;\r
+}\r
+ \r
+\r

diff --git a/imon.h b/imon.h
new file mode 100755 (executable)
index 0000000..1252e9d
--- /dev/null
+++ b/imon.h
@@ -0,0 +1,53 @@
+/* $Id: imon.h,v 1.1 2003/10/12 06:08:28 nicowallmeier Exp $
+ *
+ * imond/telmond data processing
+ *
+ * This file is part of LCD4Linux.
+ *
+ * LCD4Linux is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * LCD4Linux is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *
+ * $Log: imon.h,v $
+ * Revision 1.1  2003/10/12 06:08:28  nicowallmeier
+ * imond/telmond support
+ *
+ */
+\r
+#ifndef _IMON_H_\r
+#define _IMON_H_\r
+\r
+#define CHANNELS 9\r
+\r
+struct imonchannel {\r
+  int rate_in, rate_out, max_in, max_out; \r
+  char status[8], phone[17], ip[16], otime[11], charge[10], dev[6];\r
+};\r
+\r
+struct imon { \r
+  int cpu; \r
+  char date[11], time[9];\r
+};\r
+\r
+struct telmon { \r
+  char number[256], msn[256], time[9], date[11];\r
+};\r
+\r
+int Imon(struct imon *i, int cpu, int datetime);\r
+int ImonCh(int index, struct imonchannel *ch, int token_usage[]);\r
+char* ImonVer();\r
+\r
+int Telmon(struct telmon *t);\r
+\r
+#endif\r

diff --git a/parser.c b/parser.c
index 44252adfb6f9a23f040fd6e33029736650c69e10..84e5252998ec3f6251069468e8f13198eb8ea0b2 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -1,4 +1,4 @@
-/* $Id: parser.c,v 1.21 2003/10/05 17:58:50 reinelt Exp $
+/* $Id: parser.c,v 1.22 2003/10/12 06:08:28 nicowallmeier Exp $
  *
  * row definition parser
  *
@@ -22,6 +22,9 @@
  *
  *
  * $Log: parser.c,v $
+ * Revision 1.22  2003/10/12 06:08:28  nicowallmeier
+ * imond/telmond support
+ *
  * Revision 1.21  2003/10/05 17:58:50  reinelt
  * libtool junk; copyright messages cleaned up
  *
@@ -192,6 +195,21 @@ static SYMTAB Symtab[] = {{ "%",  T_PERCENT,    C_GENERIC, 0 },
                          { "u*", T_MAIL_UNSEEN,C_MAIL,    0 },
                          { "s*", T_SENSOR,     C_SENSOR,  1 },
                          { "x*", T_EXEC,       C_EXEC,    1 },
+                         { "jc", T_IMON_CPU,   C_IMON,    1 },
+                         { "jv", T_IMON_VER,   C_IMON,    0 },
+                         { "jd", T_IMON_DATE,  C_IMON,    0 },
+                         { "jm", T_IMON_TIME,  C_IMON,    0 },
+                         { "ji*",T_IMON_RIN,   C_IMON,    1 },
+                         { "jo*",T_IMON_ROUT,  C_IMON,    1 },
+                         { "js*",T_IMON_STATUS,C_IMON,    0 },
+                         { "jn*",T_IMON_PHONE, C_IMON,    0 },
+                         { "jp*",T_IMON_IP,    C_IMON,    0 },
+                         { "jt*",T_IMON_OTIME, C_IMON,    0 },
+                         { "jk*",T_IMON_CHARGE,C_IMON,    0 },
+                         { "kn", T_TELMON_NUMBER, C_TELMON,0 },
+                         { "km", T_TELMON_MSN, C_TELMON,  0 },
+                         { "kd", T_TELMON_DATE, C_TELMON, 0 },
+                         { "kt", T_TELMON_TIME, C_TELMON, 0 },
                          { "",  -1,            0 }};
 
 static int bar_type (char tag)

diff --git a/parser.h b/parser.h
index caeb8ddafda5760beb7e686d47125f345368e6ea..dd607d67a56d26c2e8c624c0ec8a540f2051ebcb 100644 (file)
--- a/parser.h
+++ b/parser.h
@@ -1,4 +1,4 @@
-/* $Id: parser.h,v 1.14 2003/10/05 17:58:50 reinelt Exp $
+/* $Id: parser.h,v 1.15 2003/10/12 06:08:28 nicowallmeier Exp $
  *
  * row definition parser
  *
@@ -22,6 +22,9 @@
  *
  *
  * $Log: parser.h,v $
+ * Revision 1.15  2003/10/12 06:08:28  nicowallmeier
+ * imond/telmond support
+ *
  * Revision 1.14  2003/10/05 17:58:50  reinelt
  * libtool junk; copyright messages cleaned up
  *
@@ -101,12 +104,15 @@ typedef enum {
   T_EXTENDED,
   T_MAIL, T_MAIL_UNSEEN,
   T_SENSOR,
-  T_EXEC
+  T_EXEC,
+  T_IMON_CPU, T_IMON_VER, T_IMON_DATE, T_IMON_TIME, T_IMON_RIN, T_IMON_ROUT,
+  T_IMON_STATUS, T_IMON_PHONE, T_IMON_IP, T_IMON_OTIME, T_IMON_CHARGE,
+  T_TELMON_NUMBER, T_TELMON_MSN, T_TELMON_TIME, T_TELMON_DATE
 } TOKEN;
 
 typedef enum {
   C_GENERIC, C_MEM, C_LOAD, C_CPU, C_DISK, C_ETH, C_PPP, C_ISDN, C_SETI, C_BATT, C_DVB,
-  C_MAIL, C_SENSOR, C_EXEC
+  C_MAIL, C_SENSOR, C_EXEC, C_IMON, C_TELMON
 } CLASS;
 
 char *parse_row (char *string, int supported_bars, int usage[]);

diff --git a/processor.c b/processor.c
index 788d900b018d9bbcc1fa49f8153722a828e710f8..9ac97861c547914f929f1e8515ba7865f14dc4b8 100644 (file)
--- a/processor.c
+++ b/processor.c
@@ -1,4 +1,4 @@
-/* $Id: processor.c,v 1.48 2003/10/12 04:46:19 reinelt Exp $
+/* $Id: processor.c,v 1.49 2003/10/12 06:08:28 nicowallmeier Exp $
  *
  * main data processing
  *
@@ -22,6 +22,9 @@
  *
  *
  * $Log: processor.c,v $
+ * Revision 1.49  2003/10/12 06:08:28  nicowallmeier
+ * imond/telmond support
+ *
  * Revision 1.48  2003/10/12 04:46:19  reinelt
  *
  *
@@ -236,6 +239,7 @@
 #include "dvb.h"
 #include "seti.h"
 #include "exec.h"
+#include "imon.h"
 
 #define ROWS 64
 #define ICONS 8
@@ -259,6 +263,9 @@ static struct { double perc, cput; } seti;
 static struct { int num, unseen;} mail[MAILBOXES+1];
 static struct { double val, min, max; } sensor[SENSORS+1];
 static struct { double strength, snr; } dvb;
+static struct imonchannel imonch[CHANNELS+1];
+static struct imon imon;
+static struct telmon telmon;
 
 extern int tick, tack;
 static int tick_text, tick_bar, tick_icon, tick_gpo;
@@ -368,6 +375,14 @@ static double query (int token)
   case T_EXEC:
     return exec[(token>>8)-'0'].val;
 
+  case T_IMON_CPU:
+    return imon.cpu;
+    
+  case T_IMON_RIN:
+    return ((double)imonch[(token>>8)-'0'].rate_in)/1024;
+    
+  case T_IMON_ROUT:
+    return ((double)imonch[(token>>8)-'0'].rate_out)/1024;
   }
   return 0.0;
 }
@@ -438,7 +453,19 @@ static double query_bar (int token)
   case T_SENSOR:
     i=(token>>8)-'0';
     return (value-sensor[i].min)/(sensor[i].max-sensor[i].min);
+  
+  case T_IMON_CPU:
+    return value/100;
+  
+  case T_IMON_RIN:
+    i=(token>>8)-'0';
+       return value/(imonch[i].max_in/8);
+  
+  case T_IMON_ROUT:
+    i=(token>>8)-'0';
+       return value/(imonch[i].max_out/8);
   }
+  
   return value;
 }
 
@@ -594,6 +621,63 @@ static void print_token (int token, char **p, char *start)
     *p+=sprintf (*p, "%.*s",cols-(int)(*p-start), exec[i].s);
     break;
     
+  case T_IMON_VER:
+    *p+=sprintf (*p, "%s", ImonVer());
+    break;
+    
+  case T_IMON_DATE:
+    *p+=sprintf (*p, "%s ", imon.date);
+    break;
+
+  case T_IMON_TIME:
+    *p+=sprintf (*p, "%s ", imon.time);
+    break;
+    
+  case T_IMON_CPU:
+    *p+=sprintf (*p, "%3.0f", query(token));
+    break;
+    
+  case T_IMON_RIN:
+  case T_IMON_ROUT:
+    *p+=sprintf(*p, "%4.1f", query(token));
+    break;
+  
+  case T_IMON_STATUS:
+    *p+=sprintf(*p, "%s", imonch[(token>>8)-'0'].status);
+    break;
+
+  case T_IMON_PHONE:
+    *p+=sprintf(*p, "%s", imonch[(token>>8)-'0'].phone);
+    break;
+
+  case T_IMON_IP:
+    *p+=sprintf(*p, "%s", imonch[(token>>8)-'0'].ip);
+    break;
+
+  case T_IMON_OTIME:
+    *p+=sprintf(*p, "%s", imonch[(token>>8)-'0'].otime);
+    break;
+
+  case T_IMON_CHARGE:
+    *p+=sprintf(*p, "%s", imonch[(token>>8)-'0'].charge);
+    break;
+    
+  case T_TELMON_NUMBER:
+    *p+=sprintf(*p, "%s", telmon.number);
+    break;
+
+  case T_TELMON_MSN:
+    *p+=sprintf(*p, "%s", telmon.msn);
+    break;
+    
+  case T_TELMON_DATE:
+    *p+=sprintf(*p, "%s", telmon.date);
+    break;
+
+  case T_TELMON_TIME:
+    *p+=sprintf(*p, "%s", telmon.time);
+    break;
+
   default:
     *p+=sprintf (*p, "%5.0f", query(token));
   }
@@ -658,6 +742,29 @@ static void collect_data (void)
     DVB (&dvb.strength, &dvb.snr);
   }
   
+  if (token_usage[C_IMON]) {
+    if (token_usage[T_IMON_CPU] ||
+        token_usage[T_IMON_DATE] ||
+        token_usage[T_IMON_TIME]) {  
+      Imon (&imon, T_IMON_CPU, T_IMON_DATE+T_IMON_TIME);
+    }
+    for (i=0; i<=CHANNELS; i++) {
+      if (((1<<i) & token_usage[T_IMON_RIN]) ||
+                 ((1<<i) & token_usage[T_IMON_ROUT]) ||
+          ((1<<i) & token_usage[T_IMON_STATUS]) ||
+          ((1<<i) & token_usage[T_IMON_PHONE]) || 
+          ((1<<i) & token_usage[T_IMON_IP]) ||
+          ((1<<i) & token_usage[T_IMON_OTIME]) ||
+          ((1<<i) & token_usage[T_IMON_CHARGE])){
+          ImonCh(i, &imonch[i], token_usage);
+      }
+    }
+  }
+  
+  if (token_usage[C_TELMON]) {
+       Telmon (&telmon);
+  }
+
   for (i=0; i<=MAILBOXES; i++) {
     if (token_usage[T_MAIL]&(1<<i) || token_usage[T_MAIL_UNSEEN]&(1<<i) ) {
       Mail (i, &mail[i].num, &mail[i].unseen);