retronetworking
/
isdn4k-utils
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Explicitly set stdio buffer for /dev/isdninfo to 2048, as it has 

happened that stdio used 1024, and /dev/isdninfo doesn't support
partial reads (0 bytes are returned). Usually not a problem, but
with more than one channel connected, a line of > 1024 bytes is
returned.
Also optimized the curses usage a bit, explicitly writing spaces
so that background colours are set correctly everywhere.
Bumped displayed version to 2.2.
This commit is contained in:
Paul Slootman 2002-07-15 11:58:32 +00:00
parent 8ce4149e23
commit bb74d7be57
1 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
imon/imon.c
View File

@ -19,6 +19,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.5 2001/08/22 11:12:00 paul
* imon wasn't devfs-compliant yet.
*
* Revision 1.4 2000/06/13 10:51:06 armin * Revision 1.4 2000/06/13 10:51:06 armin
* fixed status output if channels are in * fixed status output if channels are in
* a different order. * a different order.
@ -87,12 +90,12 @@ static FILE *isdninfo;
static int color; static int color;
static char *phonebook; static char *phonebook;
static struct phone_entry *phones; static struct phone_entry *phones;
static char idmap_line[4096]; static char idmap_line[2048];
static char chmap_line[4096]; static char chmap_line[2048];
static char drmap_line[4096]; static char drmap_line[2048];
static char usage_line[4096]; static char usage_line[2048];
static char flags_line[4096]; static char flags_line[2048];
static char phone_line[4096]; static char phone_line[2048];
WINDOW *statwin; WINDOW *statwin;
WINDOW *stathdr; WINDOW *stathdr;
@ -195,14 +198,14 @@ static void readphonebook() {
*/ */
char *find_name(char *num) { char *find_name(char *num) {
struct phone_entry *p = phones; struct phone_entry *p = phones;
static char tmp[100]; static char tmp[30];
sprintf(tmp, "%-28s", num); sprintf(tmp, "%-28.28s", num);
if (!show_names) if (!show_names)
return(tmp); return(tmp);
while (p) { while (p) {
if (wildmat(num, p->phone)) { if (wildmat(num, p->phone)) {
sprintf(tmp, "%-28s", p->name); sprintf(tmp, "%-28.28s", p->name);
break; break;
} }
p = p->next; p = p->next;
@ -226,7 +229,7 @@ void cleanup(int dummy) {
void usage(void) { void usage(void) {
fprintf(stderr,"usage: imon [-q][-p PhoneBookFile]\n"); fprintf(stderr,"usage: imon [-q][-p PhoneBookFile]\n");
exit(-1); exit(1);
} }
/* /*
@ -276,7 +279,7 @@ int imon_draw_mask(int color) {
move(line, 0); move(line, 0);
addch(ACS_VLINE); addch(ACS_VLINE);
for(col=2; col<COLS; col++) for(col=2; col<COLS; col++)
addch(32); addch(' ');
addch(ACS_VLINE); addch(ACS_VLINE);
} }
move(LINES-4, 0); move(LINES-4, 0);
@ -303,11 +306,14 @@ int imon_draw_mask(int color) {
wattroff(stathdr, COLOR_PAIR(WHITE_ON_BLACK)); wattroff(stathdr, COLOR_PAIR(WHITE_ON_BLACK));
wattron(stathdr, COLOR_PAIR(YELLOW_ON_BLUE)); wattron(stathdr, COLOR_PAIR(YELLOW_ON_BLUE));
} }
mvaddstr(1, 2, "iMON 2.1"); for(line=0; line<3; line++) {
mvaddstr(1, COLS-23 , "Last Update: "); mvwprintw(stathdr, line, 0, "%100s", "");
mvwaddstr(stathdr, 0, 0, "Nr. LineID Status Phone Number Usage Type "); }
mvaddstr(1, 2, "iMON 2.2");
mvaddstr(1, COLS-34 , "Last Update: ");
mvwaddstr(stathdr, 0, 0, "Nr. LineID Status Phone Number Usage Type");
wmove(stathdr, 1, 0); wmove(stathdr, 1, 0);
for(col=1; col<100; col++) for(col=0; col<100; col++)
waddch(stathdr, ACS_HLINE); waddch(stathdr, ACS_HLINE);
if(color == TRUE) { if(color == TRUE) {
attroff(COLOR_PAIR(YELLOW_ON_BLUE)); attroff(COLOR_PAIR(YELLOW_ON_BLUE));
@ -320,19 +326,19 @@ static void imon_read_status() {
/* /*
* read the 6 important lines * read the 6 important lines
*/ */
fgets(idmap_line, 4095, isdninfo); fgets(idmap_line, sizeof idmap_line, isdninfo);
fgets(chmap_line, 4095, isdninfo); fgets(chmap_line, sizeof chmap_line, isdninfo);
fgets(drmap_line, 4095, isdninfo); fgets(drmap_line, sizeof drmap_line, isdninfo);
fgets(usage_line, 4095, isdninfo); fgets(usage_line, sizeof usage_line, isdninfo);
fgets(flags_line, 4095, isdninfo); fgets(flags_line, sizeof flags_line, isdninfo);
fgets(phone_line, 4095, isdninfo); fgets(phone_line, sizeof phone_line, isdninfo);
#ifdef TEST_IMON #ifdef TEST_IMON
sprintf(idmap_line, "idmap: TA250034 - - - - - - - - - - - - - - -"); strcpy(idmap_line, "idmap: TA250034 - - - - - - - - - - - - - - -");
sprintf(chmap_line, "chmap: 0 1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1"); strcpy(chmap_line, "chmap: 0 1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1");
sprintf(drmap_line, "drmap: 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1"); strcpy(drmap_line, "drmap: 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1");
sprintf(usage_line, "usage: 1 2 0 3 4 0 5 0 129 0 130 131 132 0 0 133"); strcpy(usage_line, "usage: 1 2 0 3 4 0 5 0 129 0 130 131 132 0 0 133");
sprintf(flags_line, "flags: 0 ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?"); strcpy(flags_line, "flags: 0 ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?");
sprintf(phone_line, "phone: 05114711 0815 ??? 5555 666666666 ??? 4711 ??? 875257 ??? 77848 7890 2345467 ??? ??? 88888"); strcpy(phone_line, "phone: 05114711 0815 ??? 5555 666666666 ??? 4711 ??? 875257 ??? 77848 7890 2345467 ??? ??? 88888");
#endif #endif
} }
@ -352,11 +358,10 @@ int imon_draw_status(int color, time_t *current_time) {
char drvid[15]; char drvid[15];
char s_drvid[15]; char s_drvid[15];
char status[15]; char *status;
char phone[30]; char phone[30];
char s_usage[15]; char *s_usage;
char inout[10]; char *inout;
char temp[30];
int usage; int usage;
int chanum; int chanum;
@ -398,12 +403,11 @@ int imon_draw_status(int color, time_t *current_time) {
/* A channel-number of -1 indicates an nonexistent channel */ /* A channel-number of -1 indicates an nonexistent channel */
if (chanum==-1) { if (chanum==-1) {
sprintf(temp,"%2d ", line);
if (color) { if (color) {
wattroff(statwin, A_BOLD); wattroff(statwin, A_BOLD);
wattron(statwin, COLOR_PAIR(WHITE_ON_BLUE)); wattron(statwin, COLOR_PAIR(WHITE_ON_BLUE));
} }
mvwaddstr(statwin, line, 0, temp); mvwprintw(statwin, line, 0, "%2d%98s", line, "");
continue; continue;
} }
/* /*
@ -416,12 +420,12 @@ int imon_draw_status(int color, time_t *current_time) {
if (!(usage & 7)) { if (!(usage & 7)) {
if (color) if (color)
wattron(statwin, COLOR_PAIR(GREEN_ON_BLUE)); wattron(statwin, COLOR_PAIR(GREEN_ON_BLUE));
sprintf(status, "%s",(usage&64)?"Exclusive ":"Offline "); status = (usage&64) ? "Exclusive" : "Offline";
sprintf(phone, " "); s_phone = "";
s_phone = phone; s_usage = "";
sprintf(s_usage, " "); inout = "";
sprintf(inout, " "); }
} else { else {
int online = (flags[drvnum] & (1<<chanum)); int online = (flags[drvnum] & (1<<chanum));
if (color) { if (color) {
if (online) if (online)
@ -431,43 +435,36 @@ int imon_draw_status(int color, time_t *current_time) {
wattron(statwin, COLOR_PAIR(YELLOW_ON_BLUE)); wattron(statwin, COLOR_PAIR(YELLOW_ON_BLUE));
} }
} }
sprintf(status, online?"Online ":"Calling "); status = online ? "Online" : "Calling";
sprintf(inout, (usage&ISDN_USAGE_OUTGOING)?"Outgoing ":"Incoming "); inout = (usage&ISDN_USAGE_OUTGOING)?"Outgoing":"Incoming";
switch (usage & 7) { switch (usage & 7) {
case ISDN_USAGE_RAW: case ISDN_USAGE_RAW:
sprintf(s_usage, "Raw "); s_usage = "Raw";
break; break;
case ISDN_USAGE_MODEM: case ISDN_USAGE_MODEM:
sprintf(s_usage, "Modem "); s_usage = "Modem";
break; break;
case ISDN_USAGE_NET: case ISDN_USAGE_NET:
sprintf(s_usage, "Net "); s_usage = "Net";
break; break;
case ISDN_USAGE_VOICE: case ISDN_USAGE_VOICE:
sprintf(s_usage, "Voice "); s_usage = "Voice";
break; break;
case ISDN_USAGE_FAX: case ISDN_USAGE_FAX:
sprintf(s_usage, "Fax "); s_usage = "Fax";
break; break;
default: default:
sprintf(s_usage, "----- "); s_usage = "-----";
break; break;
} }
s_phone = find_name(phone); s_phone = find_name(phone);
} }
sprintf(temp,"%2d ", line); mvwprintw(statwin, line, 0, "%2d %-13s%-10s%-28s%-10s%-9s%26s", line, s_drvid, status, s_phone, s_usage, inout, "");
mvwaddstr(statwin, line, 0, temp);
mvwaddstr(statwin, line, 4, s_drvid);
mvwaddstr(statwin, line, 17, status);
mvwaddstr(statwin, line, 27, s_phone);
mvwaddstr(statwin, line, 55, s_usage);
mvwaddstr(statwin, line, 67, inout);
} }
now = localtime(current_time);
sprintf(temp, "%02d:%02d:%02d", now->tm_hour,now->tm_min,now->tm_sec);
if (color == TRUE) if (color == TRUE)
attron(COLOR_PAIR(YELLOW_ON_BLUE)); attron(COLOR_PAIR(YELLOW_ON_BLUE));
mvaddstr(1, COLS-10, temp); now = localtime(current_time);
mvprintw(1, COLS-21, "%04d-%02d-%02d %02d:%02d:%02d", now->tm_year+1900, now->tm_mon+1, now->tm_mday, now->tm_hour,now->tm_min,now->tm_sec);
prefresh(stathdr, 0, stat_x, 3, 2, 5, COLS-3); prefresh(stathdr, 0, stat_x, 3, 2, 5, COLS-3);
prefresh(statwin, stat_y, stat_x, 5, 2, LINES-5, COLS-3); prefresh(statwin, stat_y, stat_x, 5, 2, LINES-5, COLS-3);
return(TRUE); return(TRUE);
@ -486,6 +483,7 @@ int main(int argc, char **argv) {
int quit , i; int quit , i;
fd_set fdset; fd_set fdset;
struct timeval timeout; struct timeval timeout;
static char fbuf[2048];
/* /*
* check parameters * check parameters
@ -516,6 +514,8 @@ int main(int argc, char **argv) {
return 1; return 1;
} }
} }
setvbuf(isdninfo, fbuf, _IOFBF, sizeof(fbuf)); /* up to 2048 needed */
if (phonebook) if (phonebook)
readphonebook(); readphonebook();