welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

skip newlines in ringbuffer messages

Browse source
This commit is contained in:
bodea 2004-12-03 06:41:11 +00:00
parent 12f5781dc3
commit e14594640a
2 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Changes
View file

@ -3,6 +3,7 @@
changes, propagated in the heartbeats; the master with the highest # changes, propagated in the heartbeats; the master with the highest #
of changes (that has kept in contact with the LAC through the of changes (that has kept in contact with the LAC through the
outage) prevails. outage) prevails.
- Skip newlines in ringbuffer messages to CLI.
* Wed Dec 1 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.12 * Wed Dec 1 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.12
- The "This time, for sure!" release. - The "This time, for sure!" release.

52
cli.c
View file

@ -2,7 +2,7 @@
// vim: sw=8 ts=8 // vim: sw=8 ts=8
char const *cvs_name = "$Name: $"; char const *cvs_name = "$Name: $";
char const *cvs_id_cli = "$Id: cli.c,v 1.38 2004/12/01 02:51:06 bodea Exp $"; char const *cvs_id_cli = "$Id: cli.c,v 1.39 2004/12/03 06:41:11 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
@ -1861,42 +1861,44 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
int regular_stuff(struct cli_def *cli) int regular_stuff(struct cli_def *cli)
{ {
int i = debug_rb_tail; int out = 0;
int reprompt = 0; int i;
#ifdef RINGBUFFER #ifdef RINGBUFFER
while (i != ringbuffer->tail) for (i = debug_rb_tail; i != ringbuffer->tail; i = (i + 1) % RINGBUFFER_SIZE)
{ {
int show_message = 0; char *m = ringbuffer->buffer[i].message;
char *p;
int show = 0;
if (*ringbuffer->buffer[i].message) if (!*m) continue;
switch (ringbuffer->buffer[i].level)
{ {
// Always show messages if we are doing general debug case 0: show = debug_flags.critical; break;
if (ringbuffer->buffer[i].level == 0 && debug_flags.critical) show_message = 1; case 1: show = debug_flags.error; break;
if (ringbuffer->buffer[i].level == 1 && debug_flags.error) show_message = 1; case 2: show = debug_flags.warning; break;
if (ringbuffer->buffer[i].level == 2 && debug_flags.warning) show_message = 1; case 3: show = debug_flags.info; break;
if (ringbuffer->buffer[i].level == 3 && debug_flags.info) show_message = 1; case 4: show = debug_flags.calls; break;
if (ringbuffer->buffer[i].level == 4 && debug_flags.calls) show_message = 1; case 5: show = debug_flags.data; break;
if (ringbuffer->buffer[i].level == 5 && debug_flags.data) show_message = 1;
} }
if (show_message) if (!show) continue;
{
cli_print(cli, "\r%s-%u-%u %s",
debug_levels[(int)ringbuffer->buffer[i].level],
ringbuffer->buffer[i].tunnel,
ringbuffer->buffer[i].session,
ringbuffer->buffer[i].message);
reprompt = 1; if (!(p = strchr(m, '\n')))
} p = m + strlen(p);
if (++i == ringbuffer->tail) break; cli_print(cli, "\r%s-%u-%u %.*s",
if (i == RINGBUFFER_SIZE) i = 0; debug_levels[(int)ringbuffer->buffer[i].level],
ringbuffer->buffer[i].tunnel,
ringbuffer->buffer[i].session,
p - m, m);
out++;
} }
debug_rb_tail = ringbuffer->tail; debug_rb_tail = ringbuffer->tail;
if (reprompt) if (out)
cli_reprompt(cli); cli_reprompt(cli);
#endif #endif
return CLI_OK; return CLI_OK;