#define LOGLINES 128
char logline[LOGLINES][512];
-unsigned long logcur = 0;
+unsigned int logcur = 0;
int logfh = -1;
char logfile[128];
}
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;
}
/* loop all related ports */
ltee = 0;
- j = msg->u.s.interfaces+msg->u.s.joins+msg->u.s.epoints;
+ j = msg->u.s.interfaces+msg->u.s.remotes+msg->u.s.joins+msg->u.s.epoints;
jj = j + msg->u.s.ports;
while(j < jj)
{
}
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;
addstr(buffer);
}
/* find number of epoints */
- j = msg->u.s.interfaces+msg->u.s.joins;
+ j = msg->u.s.interfaces+msg->u.s.remotes+msg->u.s.joins;
jj = j + msg->u.s.epoints;
i = 0;
while(j < jj)
j++;
}
/* loop all related endpoints */
- j = msg->u.s.interfaces+msg->u.s.joins;
+ j = msg->u.s.interfaces+msg->u.s.remotes+msg->u.s.joins;
jj = j + msg->u.s.epoints;
while(j < jj)
{
*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;
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);
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])
{
if (m[i].u.i.port[j])
{
/* search for port */
- l = msg.u.s.interfaces+msg.u.s.joins+msg.u.s.epoints;
+ l = msg.u.s.interfaces+msg.u.s.remotes+msg.u.s.joins+msg.u.s.epoints;
ll = l+msg.u.s.ports;
while(l < ll)
{
i++;
anything = 1;
}
- i = 0;
+ i = msg.u.s.interfaces;
ii = i + msg.u.s.remotes;
while(i < ii)
{
if (show_calls == 1)
{
anything = 0;
- i = msg.u.s.interfaces+msg.u.s.joins;
+ i = msg.u.s.interfaces+msg.u.s.remotes+msg.u.s.joins;
ii = i+msg.u.s.epoints;
while(i < ii)
{
i++;
anything = 1;
}
- j = msg.u.s.interfaces;
+ j = msg.u.s.interfaces+msg.u.s.remotes;
jj = j+msg.u.s.joins;
while(j < jj)
{
color(white);
SPRINT(buffer, "(%d):", m[j].u.j.serial);
addstr(buffer);
- i = msg.u.s.interfaces+msg.u.s.joins;
+ i = msg.u.s.interfaces+msg.u.s.remotes+msg.u.s.joins;
ii = i+msg.u.s.epoints;
while(i < ii)
{
{
/* show all ports with no epoint */
anything = 0;
- i = msg.u.s.interfaces+msg.u.s.joins+msg.u.s.epoints;
+ i = msg.u.s.interfaces+msg.u.s.remotes+msg.u.s.joins+msg.u.s.epoints;
ii = i+msg.u.s.ports;
while(i < ii)
{
/* show all epoints with no call */
anything = 0;
- i = msg.u.s.interfaces+msg.u.s.joins;
+ i = msg.u.s.interfaces+msg.u.s.remotes+msg.u.s.joins;
ii = i+msg.u.s.epoints;
while(i < ii)
{
/* show all joins */
anything = 0;
- i = msg.u.s.interfaces;
+ i = msg.u.s.interfaces+msg.u.s.remotes;
ii = i+msg.u.s.joins;
while(i < ii)
{
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;