X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=lcradmin.c;h=1df16c597358d0666abdd9265232b9497edb9e7e;hp=f771609b4d021c46827a06577ebef986cddaa3fd;hb=ff4d197d5ecb2cb29a55f78b260ab387e3afc80d;hpb=16488a01568e7c35d0e7adf46fdfee5e488df8d8

diff --git a/lcradmin.c b/lcradmin.c
index f771609..1df16c5 100644
--- a/lcradmin.c
+++ b/lcradmin.c
@@ -76,7 +76,7 @@ char	red = 1,
 
 #define LOGLINES 128
 char logline[LOGLINES][512];
-unsigned long logcur = 0;
+unsigned int logcur = 0;
 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)
 {
-	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;
@@ -359,7 +359,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.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)
 	{
@@ -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)
 {
-	unsigned long	join = m[i].u.j.serial;
+	unsigned int	join = m[i].u.j.serial;
 	char		buffer[256];
 	int		j, jj;
 
@@ -416,7 +416,7 @@ int debug_join(struct admin_message *msg, struct admin_message *m, int line, int
 		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)
@@ -426,7 +426,7 @@ int debug_join(struct admin_message *msg, struct admin_message *m, int line, int
 		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)
 	{
@@ -457,7 +457,7 @@ char *admin_state(int sock, char *argv[])
 				*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;
@@ -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.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);
@@ -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);
+							if (m[i].u.i.mode[j] == B_MODE_HDLC)
+								SCAT(buffer,"HDLC ");
 							addstr(buffer);
 							switch(m[i].u.i.busy[j])
 							{
@@ -778,7 +783,7 @@ char *admin_state(int sock, char *argv[])
 							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)
 								{
@@ -834,7 +839,7 @@ char *admin_state(int sock, char *argv[])
 			i++;
 			anything = 1;
 		}
-		i = 0;
+		i = msg.u.s.interfaces;
 		ii = i + msg.u.s.remotes;
 		while(i < ii)
 		{
@@ -853,7 +858,7 @@ char *admin_state(int sock, char *argv[])
 	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)
 		{
@@ -892,7 +897,7 @@ char *admin_state(int sock, char *argv[])
 			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)
 		{
@@ -901,7 +906,7 @@ char *admin_state(int sock, char *argv[])
 			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)
 			{
@@ -943,7 +948,7 @@ char *admin_state(int sock, char *argv[])
 	{
 		/* 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)
 		{
@@ -963,7 +968,7 @@ char *admin_state(int sock, char *argv[])
 
 		/* 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)
 		{
@@ -983,7 +988,7 @@ char *admin_state(int sock, char *argv[])
 
 		/* 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)
 		{
@@ -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;
-	unsigned long on = 1;
+	unsigned int on = 1;
 	struct timeval now_tv;
 	struct timezone now_tz;