fixes & improvements
[lcr.git] / admin_client.c
index 982b836..a7e7f52 100644 (file)
@@ -1,6 +1,6 @@
 /*****************************************************************************\
 **                                                                           **
-** LCR                                                                       **
+** Linux Call Router                                                         **
 **                                                                           **
 **---------------------------------------------------------------------------**
 ** Copyright: Andreas Eversberg                                              **
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <curses.h>
-#include "save.h"
-#include "call.h"
-#include "callpbx.h"
+#include "macro.h"
+#include "join.h"
+#include "joinpbx.h"
+#include "extension.h"
+#include "message.h"
 #include "admin.h"
 #include "cause.h"
 
@@ -71,7 +73,7 @@ char  red = 1,
        white = 7;
 
 #define LOGLINES 128
-char logline[LOGLINES][256];
+char logline[LOGLINES][512];
 unsigned long logcur = 0;
 int logfh = -1;
 char logfile[128];
@@ -355,7 +357,7 @@ int debug_epoint(struct admin_message *msg, struct admin_message *m, int line, i
        }
        /* loop all related ports */
        ltee = 0;
-       j = msg->u.s.interfaces+msg->u.s.calls+msg->u.s.epoints;
+       j = msg->u.s.interfaces+msg->u.s.joins+msg->u.s.epoints;
        jj = j + msg->u.s.ports;
        while(j < jj)
        {
@@ -386,39 +388,39 @@ int debug_epoint(struct admin_message *msg, struct admin_message *m, int line, i
 
        return(line);
 }
-int debug_call(struct admin_message *msg, struct admin_message *m, int line, int i)
+int debug_join(struct admin_message *msg, struct admin_message *m, int line, int i)
 {
-       unsigned long   call = m[i].u.c.serial;
+       unsigned long   join = m[i].u.j.serial;
        char            buffer[256];
        int             j, jj;
 
        color(white);
-       SPRINT(buffer,"CALL(%d)", call);
+       SPRINT(buffer,"JOIN(%d)", join);
        addstr(buffer);
-       if (m[i].u.c.partyline)
+       if (m[i].u.j.partyline)
        {
                color(cyan);
                addstr(" partyline=");
                color(white);
-               SPRINT(buffer, "%d\n", m[i].u.c.partyline);
+               SPRINT(buffer, "%d\n", m[i].u.j.partyline);
                addstr(buffer);
        }
        /* find number of epoints */
-       j = msg->u.s.interfaces+msg->u.s.calls;
+       j = msg->u.s.interfaces+msg->u.s.joins;
        jj = j + msg->u.s.epoints;
        i = 0;
        while(j < jj)
        {
-               if (m[j].u.e.call == call)
+               if (m[j].u.e.join == join)
                        i++;
                j++;
        }
        /* loop all related endpoints */
-       j = msg->u.s.interfaces+msg->u.s.calls;
+       j = msg->u.s.interfaces+msg->u.s.joins;
        jj = j + msg->u.s.epoints;
        while(j < jj)
        {
-               if (m[j].u.e.call == call)
+               if (m[j].u.e.join == join)
                {
                        i--;
                        move(++line>1?line:1, 1);
@@ -437,13 +439,13 @@ int debug_call(struct admin_message *msg, struct admin_message *m, int line, int
 
        return(line);
 }
-char *admin_state(int sock)
+char *admin_state(int sock, char *argv[])
 {
        struct admin_message    msg,
                                *m;
-       char                    buffer[256],
+       char                    buffer[512],
                                *p;
-       int                     line, offset = 0;
+       int                     line, offset = 0, hoffset = 0;
        int                     i, ii, j, jj, k;
        unsigned long           l, ll;
        int                     num;
@@ -451,6 +453,8 @@ char *admin_state(int sock)
        int                     off;
        int                     ltee;
        int                     anything;
+       int                     enter = 0;
+       char                    enter_string[128] = "", ch;
 
        /* flush logfile name */
        logfile[0] = '\0';
@@ -481,12 +485,8 @@ char *admin_state(int sock)
                cleanup_curses();
                return("Response not valid. Expecting state response.");
        }
-       num = msg.u.s.interfaces + msg.u.s.calls + msg.u.s.epoints + msg.u.s.ports;
-       if (!(m = (struct admin_message *)malloc(num*sizeof(struct admin_message))))
-       {
-               cleanup_curses();
-               return("Not enough memory for messages.");
-       }
+       num = msg.u.s.interfaces + msg.u.s.joins + msg.u.s.epoints + msg.u.s.ports;
+       m = (struct admin_message *)MALLOC(num*sizeof(struct admin_message));
        off=0;
        if (num)
        {
@@ -494,7 +494,7 @@ char *admin_state(int sock)
                if ((len = read(sock, ((unsigned char *)(m))+off, num*sizeof(struct admin_message)-off)) != num*(int)sizeof(struct admin_message)-off)
                {
                        if (len <= 0) {
-                               free(m);
+                               FREE(m, 0);
        //                      fprintf(stderr, "got=%d expected=%d\n", i, num*sizeof(struct admin_message));
                                cleanup_curses();
                                return("Broken pipe while receiving state infos.");
@@ -514,7 +514,7 @@ char *admin_state(int sock)
 //             fprintf(stderr, "j=%d message=%d\n", j, m[j].message);
                if (m[j].message != ADMIN_RESPONSE_S_INTERFACE)
                {
-                       free(m);
+                       FREE(m, 0);
                        cleanup_curses();
                        return("Response not valid. Expecting interface information.");
                }
@@ -522,11 +522,11 @@ char *admin_state(int sock)
                j++;
        }
        i = 0;
-       while(i < msg.u.s.calls)
+       while(i < msg.u.s.joins)
        {
-               if (m[j].message != ADMIN_RESPONSE_S_CALL)
+               if (m[j].message != ADMIN_RESPONSE_S_JOIN)
                {
-                       free(m);
+                       FREE(m, 0);
                        cleanup_curses();
                        return("Response not valid. Expecting call information.");
                }
@@ -538,7 +538,7 @@ char *admin_state(int sock)
        {
                if (m[j].message != ADMIN_RESPONSE_S_EPOINT)
                {
-                       free(m);
+                       FREE(m, 0);
                        cleanup_curses();
                        return("Response not valid. Expecting endpoint information.");
                }
@@ -550,7 +550,7 @@ char *admin_state(int sock)
        {
                if (m[j].message != ADMIN_RESPONSE_S_PORT)
                {
-                       free(m);
+                       FREE(m, 0);
                        cleanup_curses();
                        return("Response not valid. Expecting port information.");
                }
@@ -707,7 +707,7 @@ char *admin_state(int sock)
                                                        if (m[i].u.i.port[j])
                                                        {
                                                                /* search for port */
-                                                               l = msg.u.s.interfaces+msg.u.s.calls+msg.u.s.epoints;
+                                                               l = msg.u.s.interfaces+msg.u.s.joins+msg.u.s.epoints;
                                                                ll = l+msg.u.s.ports;
                                                                while(l < ll)
                                                                {
@@ -771,12 +771,12 @@ char *admin_state(int sock)
        if (show_calls == 1)
        {
                anything = 0;
-               i = msg.u.s.interfaces+msg.u.s.calls;
+               i = msg.u.s.interfaces+msg.u.s.joins;
                ii = i+msg.u.s.epoints;
                while(i < ii)
                {
                        /* for each endpoint... */
-                       if (!m[i].u.e.call)
+                       if (!m[i].u.e.join)
                        {
                                move(++line>1?line:1, 0);
                                color(white);
@@ -811,20 +811,20 @@ char *admin_state(int sock)
                        anything = 1;
                }
                j = msg.u.s.interfaces;
-               jj = j+msg.u.s.calls;
+               jj = j+msg.u.s.joins;
                while(j < jj)
                {
                        /* for each call... */
                        move(++line>1?line:1, 0);
                        color(white);
-                       SPRINT(buffer, "(%d):", m[j].u.c.serial);
+                       SPRINT(buffer, "(%d):", m[j].u.j.serial);
                        addstr(buffer);
-                       i = msg.u.s.interfaces+msg.u.s.calls;
+                       i = msg.u.s.interfaces+msg.u.s.joins;
                        ii = i+msg.u.s.epoints;
                        while(i < ii)
                        {
                                /* for each endpoint... */
-                               if (m[i].u.e.call == m[j].u.c.serial)
+                               if (m[i].u.e.join == m[j].u.j.serial)
                                {
                                        color(white);
                                        SPRINT(buffer, " (%d)", m[i].u.e.serial);
@@ -861,7 +861,7 @@ char *admin_state(int sock)
        {
                /* show all ports with no epoint */
                anything = 0;
-               i = msg.u.s.interfaces+msg.u.s.calls+msg.u.s.epoints;
+               i = msg.u.s.interfaces+msg.u.s.joins+msg.u.s.epoints;
                ii = i+msg.u.s.ports;
                while(i < ii)
                {
@@ -881,11 +881,11 @@ char *admin_state(int sock)
 
                /* show all epoints with no call */
                anything = 0;
-               i = msg.u.s.interfaces+msg.u.s.calls;
+               i = msg.u.s.interfaces+msg.u.s.joins;
                ii = i+msg.u.s.epoints;
                while(i < ii)
                {
-                       if (!m[i].u.e.call)
+                       if (!m[i].u.e.join)
                        {
                                move(++line>1?line:1, 4);
                                if (line+2 >= LINES) goto end;
@@ -899,15 +899,15 @@ char *admin_state(int sock)
                        line++;
                if (line+2 >= LINES) goto end;
 
-               /* show all calls */
+               /* show all joins */
                anything = 0;
                i = msg.u.s.interfaces;
-               ii = i+msg.u.s.calls;
+               ii = i+msg.u.s.joins;
                while(i < ii)
                {
                        move(++line>1?line:1, 0);
                        if (line+2 >= LINES) goto end;
-                       line = debug_call(&msg, m, line, i);
+                       line = debug_join(&msg, m, line, i);
                        if (line+2 >= LINES) goto end;
                        i++;
                        anything = 1;
@@ -935,10 +935,19 @@ char *admin_state(int sock)
                        while(l!=ll)
                        {
                                move(line++>1?line-1:1, 0);
-                               SCPY(buffer, logline[l % LOGLINES]);
-                               if (COLS < (int)sizeof(buffer))
-                                       buffer[COLS] = '\0';
-                               addstr(buffer);
+                               if (strlen(logline[l % LOGLINES]) > hoffset)
+                                       SCPY(buffer, logline[l % LOGLINES] + hoffset);
+                               else
+                                       buffer[0] = '\0';
+                               if (COLS < (int)strlen(buffer))
+                               {
+                                       buffer[COLS-1] = '\0';
+                                       addstr(buffer);
+                                       color(red);
+                                       addch('*');
+                                       color(white);
+                               } else
+                                       addstr(buffer);
                                l++;
                        }
                }
@@ -946,7 +955,7 @@ char *admin_state(int sock)
 
        end:
        /* free memory */
-       free(m);
+       FREE(m, 0);
        /* display name/time */
 //     move(0, 0);
 //     hline(' ', COLS);
@@ -974,13 +983,23 @@ char *admin_state(int sock)
                color(red);
                addstr(buffer);
        }
+       if (hoffset)
+       {
+               move(1, 13);
+               SPRINT(buffer, "H-Offset +%d", hoffset);
+               color(red);
+               addstr(buffer);
+       }
        /* display end */
        move(LINES-2, 0);
        color(white);
        hline(ACS_HLINE, COLS);
        move(LINES-1, 0);
        color(white);
-       SPRINT(buffer, "i = interfaces '%s'  c = calls '%s'  l = log  q = quit  +/- = scroll", text_interfaces[show_interfaces], text_calls[show_calls]);
+       if (enter)
+               SPRINT(buffer, "-> %s", enter_string);
+       else
+               SPRINT(buffer, "i=interfaces '%s'  c=calls '%s'  l=log  q=quit  +-*/=scroll  enter", text_interfaces[show_interfaces], text_calls[show_calls]);
        addstr(buffer);
        refresh();
 
@@ -992,47 +1011,125 @@ char *admin_state(int sock)
                goto again;
        }
 
-       /* user input */
-       switch(getch())
+       if (enter)
        {
-               case 12: /* refresh */
-               cleanup_curses();
-               init_curses();
-               goto again;
-               break;
-
-               case 3: /* abort */
-               case 'q':
-               case 'Q':
-               break;
+               /* user input in enter mode */
+               ch = getch();
+               if (ch == 10)
+               {
+                       FILE *fp;
+
+                       enter = 0;
+                       if (!enter_string[0])
+                               goto again;
+
+                       SPRINT(logline[logcur++ % LOGLINES], "> %s", enter_string);
+                       if (!!strncmp(enter_string, "interface", 10) &&
+                           !!strncmp(enter_string, "route", 6) &&
+                           !!strncmp(enter_string, "release ", 8) &&
+                           !!strncmp(enter_string, "block ", 6) &&
+                           !!strncmp(enter_string, "unblock ", 8) &&
+                           !!strncmp(enter_string, "unload ", 7))
+                       {
+                               SPRINT(logline[logcur++ % LOGLINES], "usage:");
+                               SPRINT(logline[logcur++ % LOGLINES], "interface (reload interface.conf)");
+                               SPRINT(logline[logcur++ % LOGLINES], "route (reload routing.conf)");
+                               SPRINT(logline[logcur++ % LOGLINES], "release <EP> (release endpoint with given ID)");
+                               SPRINT(logline[logcur++ % LOGLINES], "block <port> (block port for further calls)");
+                               SPRINT(logline[logcur++ % LOGLINES], "unblock <port> (unblock port for further calls, load if not loaded)");
+                               SPRINT(logline[logcur++ % LOGLINES], "unload <port> (unload mISDN stack, release call calls)");
+                       } else
+                       {
+                               /* applend output to log window */
+                               SPRINT(buffer, "%s %s", argv[0], enter_string);
+                               fp = popen(buffer, "r");
+                               if (fp)
+                               {
+                                       while(fgets(logline[logcur % LOGLINES], sizeof(logline[0]), fp))
+                                               logline[logcur++ % LOGLINES][sizeof(logline[0])-1] = '\0';
+                                       pclose(fp);
+                               } else
+                               {
+                                       SPRINT(logline[logcur++ % LOGLINES], "failed to execute '%s'", buffer);
+                               }
+                       }
+                       logline[logcur % LOGLINES][0] = '\0';
+                       enter_string[0] = '\0';
+                       goto again;
+               }
+               if (ch>=32 && ch<=126)
+               {
+                       SCCAT(enter_string, ch);
+                       goto again;
+               } else
+               if (ch==8 || ch==127)
+               {
+                       if (enter_string[0])
+                               enter_string[strlen(enter_string)-1] = '\0';
+                       goto again;
+               } else
+               if (ch != 3)
+               {
+                       usleep(250000);
+                       goto again;
+               }
+       } else
+       {
+               /* user input in normal mode */
+               switch(getch())
+               {
+                       case 12: /* refresh */
+                       cleanup_curses();
+                       init_curses();
+                       goto again;
+                       break;
 
-               case 'i': /* toggle interface */
-               show_interfaces++;
-               if (show_interfaces > 3) show_interfaces = 0;
-               goto again;
+                       case 3: /* abort */
+                       case 'q':
+                       case 'Q':
+                       break;
 
-               case 'c': /* toggle calls */
-               show_calls++;
-               if (show_calls > 2) show_calls = 0;
-               goto again;
+                       case 'i': /* toggle interface */
+                       show_interfaces++;
+                       if (show_interfaces > 3) show_interfaces = 0;
+                       goto again;
 
-               case 'l': /* toggle log */
-               show_log++;
-               if (show_log > 1) show_log = 0;
-               goto again;
+                       case 'c': /* toggle calls */
+                       show_calls++;
+                       if (show_calls > 2) show_calls = 0;
+                       goto again;
 
-               case '+': /* scroll down */
-               offset++;
-               goto again;
-               
-               case '-': /* scroll up */
-               if (offset)
-                       offset--;
-               goto again;
+                       case 'l': /* toggle log */
+                       show_log++;
+                       if (show_log > 1) show_log = 0;
+                       goto again;
 
-               default:
-               usleep(250000);
-               goto again;
+                       case '+': /* scroll down */
+                       offset++;
+                       goto again;
+                       
+                       case '-': /* scroll up */
+                       if (offset)
+                               offset--;
+                       goto again;
+
+                       case '*': /* scroll right */
+                       hoffset += 2;
+                       goto again;
+                       
+                       case '/': /* scroll left */
+                       if (hoffset)
+                               hoffset -= 2;
+                       goto again;
+
+                       case 10: /* entermode */
+                       enter = 1;
+                       goto again;
+
+                       default:
+                       usleep(250000);
+                       goto again;
+               }
        }
 
        /* check for logfh */
@@ -1251,7 +1348,7 @@ char *admin_trace(int sock, int argc, char *argv[])
        int i;
 
        /* show help */
-       if (!strcasecmp(argv[2], "help"))
+       if (argc > 2) if (!strcasecmp(argv[2], "help"))
        {
                printf("Trace Help\n----------\n");
                printf("%s trace [brief|short] [<filter>=<value> [...]]\n\n", argv[0]);
@@ -1284,7 +1381,7 @@ char *admin_trace(int sock, int argc, char *argv[])
                else if (!strcasecmp(argv[i], "short"))
                        msg.u.trace_req.detail = 2;
                else if (!strncasecmp(argv[i], "category=", 9))
-                       SCPY(msg.u.trace_req.category, argv[i]+9);
+                       msg.u.trace_req.category = atoi(argv[i]+9);
                else if (!strncasecmp(argv[i], "port=", 5))
                        msg.u.trace_req.port = atoi(argv[i]+5);
                else if (!strncasecmp(argv[i], "interface=", 10))
@@ -1427,7 +1524,7 @@ int main(int argc, char *argv[])
        switch(mode)
        {
                case MODE_STATE:
-               ret = admin_state(sock);
+               ret = admin_state(sock, argv);
                break;
        
                case MODE_INTERFACE: