projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
now LCR features real HDLC bchannel mode.
[lcr.git]
/
lcradmin.c
diff --git
a/lcradmin.c
b/lcradmin.c
index
188d718
..
1df16c5
100644
(file)
--- a/
lcradmin.c
+++ b/
lcradmin.c
@@
-76,7
+76,7
@@
char red = 1,
#define LOGLINES 128
char logline[LOGLINES][512];
#define LOGLINES 128
char logline[LOGLINES][512];
-unsigned
long
logcur = 0;
+unsigned
int
logcur = 0;
int logfh = -1;
char logfile[128];
int logfh = -1;
char logfile[128];
@@
-209,7
+209,7
@@
int debug_port(struct admin_message *msg, struct admin_message *m, int line, int
}
int debug_epoint(struct admin_message *msg, struct admin_message *m, int line, int i, int vline)
{
}
int debug_epoint(struct admin_message *msg, struct admin_message *m, int line, int i, int vline)
{
- unsigned
long
epoint = m[i].u.e.serial;
+ unsigned
int
epoint = m[i].u.e.serial;
char buffer[256];
unsigned char c;
int j, jj;
char buffer[256];
unsigned char c;
int j, jj;
@@
-392,7
+392,7
@@
int debug_epoint(struct admin_message *msg, struct admin_message *m, int line, i
}
int debug_join(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
join = m[i].u.j.serial;
+ unsigned
int
join = m[i].u.j.serial;
char buffer[256];
int j, jj;
char buffer[256];
int j, jj;
@@
-457,7
+457,7
@@
char *admin_state(int sock, char *argv[])
*p;
int line, offset = 0, hoffset = 0;
int i, ii, j, jj, k;
*p;
int line, offset = 0, hoffset = 0;
int i, ii, j, jj, k;
- unsigned
long
l, ll;
+ unsigned
int
l, ll;
int num;
int len;
int off;
int num;
int len;
int off;
@@
-679,8
+679,11
@@
char *admin_state(int sock, char *argv[])
color((m[i].u.i.l2link)?green:red);
addstr((m[i].u.i.l2link)?" L2 UP":" L2 down");
}
color((m[i].u.i.l2link)?green:red);
addstr((m[i].u.i.l2link)?" L2 UP":" L2 down");
}
- color((m[i].u.i.l1link)?green:blue);
- addstr((m[i].u.i.l1link)?" L1 ACTIVE":" L1 inactive");
+ color((m[i].u.i.l1link > 0)?green:blue);
+ if (m[i].u.i.l1link < 0)
+ addstr(" L1 unknown");
+ else
+ addstr((m[i].u.i.l1link)?" L1 ACTIVE":" L1 inactive");
if (m[i].u.i.los)
{
color(red);
if (m[i].u.i.los)
{
color(red);
@@
-736,6
+739,8
@@
char *admin_state(int sock, char *argv[])
SPRINT(buffer,"S%2d: ", j+1+(j>=15));
else
SPRINT(buffer,"B%2d: ", j+1);
SPRINT(buffer,"S%2d: ", j+1+(j>=15));
else
SPRINT(buffer,"B%2d: ", j+1);
+ if (m[i].u.i.mode[j] == B_MODE_HDLC)
+ SCAT(buffer,"HDLC ");
addstr(buffer);
switch(m[i].u.i.busy[j])
{
addstr(buffer);
switch(m[i].u.i.busy[j])
{
@@
-1346,7
+1351,7
@@
char *admin_testcall(int sock, int argc, char *argv[])
int stimeout = 0, ptimeout = 0, atimeout = 0, ctimeout = 0;
int l;
double timer = 0, now_d;
int stimeout = 0, ptimeout = 0, atimeout = 0, ctimeout = 0;
int l;
double timer = 0, now_d;
- unsigned
long
on = 1;
+ unsigned
int
on = 1;
struct timeval now_tv;
struct timezone now_tz;
struct timeval now_tv;
struct timezone now_tz;