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

diff --git a/lcradmin.c b/lcradmin.c
index 1df16c5..8cd40da 100644
--- a/lcradmin.c
+++ b/lcradmin.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <curses.h>
 #include "macro.h"
+#include "options.h"
 #include "join.h"
 #include "joinpbx.h"
 #include "extension.h"
@@ -53,14 +54,14 @@ enum {
 	MODE_TRACE,
 };
 
-char *text_interfaces[] = {
+const char *text_interfaces[] = {
 	"off",
 	"brief",
 	"active channels",
 	"all channels",
 };
 
-char *text_calls[] = {
+const char *text_calls[] = {
 	"off",
 	"brief",
 	"structured",
@@ -449,7 +450,8 @@ int debug_join(struct admin_message *msg, struct admin_message *m, int line, int
 
 	return(line);
 }
-char *admin_state(int sock, char *argv[])
+
+const char *admin_state(int sock, char *argv[])
 {
 	struct admin_message	msg,
 				*m;
@@ -666,13 +668,13 @@ char *admin_state(int sock, char *argv[])
 			color(white);
 			if (m[i].u.i.block >= 2)
 			{
-				SPRINT(buffer, "%s (%d)%s", m[i].u.i.interface_name, m[i].u.i.portnum, (m[i].u.i.extension)?" (extension)":"");
+				SPRINT(buffer, "%s (port %d: %s)%s", m[i].u.i.interface_name, m[i].u.i.portnum, m[i].u.i.portname, (m[i].u.i.extension)?" extension":"");
 				addstr(buffer);
 				color(red);
 				addstr("  not loaded");
 			} else
 			{
-				SPRINT(buffer, "%s (%d) %s %s%s use:%d", m[i].u.i.interface_name, m[i].u.i.portnum, (m[i].u.i.ntmode)?"NT-mode":"TE-mode", (m[i].u.i.ptp)?"ptp ":"ptmp", (m[i].u.i.extension)?" extension":"", m[i].u.i.use);
+				SPRINT(buffer, "%s (port %d: %s) %s %s%s use:%d", m[i].u.i.interface_name, m[i].u.i.portnum, m[i].u.i.portname, (m[i].u.i.ntmode)?"NT-mode":"TE-mode", (m[i].u.i.ptp)?"ptp ":"ptmp", (m[i].u.i.extension)?" extension":"", m[i].u.i.use);
 				addstr(buffer);
 				if (m[i].u.i.ptp || !m[i].u.i.ntmode)
 				{
@@ -1256,7 +1258,7 @@ char *admin_state(int sock, char *argv[])
 /*
  * Send command and show error message.
  */
-char *admin_cmd(int sock, int mode, char *extension, char *number)
+const char *admin_cmd(int sock, int mode, char *extension, char *number)
 {
 	static struct admin_message msg;
 
@@ -1344,7 +1346,7 @@ char *admin_cmd(int sock, int mode, char *extension, char *number)
 	gettimeofday(&now_tv, &now_tz); \
 	now_d = ((double)(now_tv.tv_usec))/1000000 + now_tv.tv_sec; \
 	}
-char *admin_testcall(int sock, int argc, char *argv[])
+const char *admin_testcall(int sock, int argc, char *argv[])
 {
 	static struct admin_message msg;
 	int ar = 2;
@@ -1554,7 +1556,7 @@ next:
 /*
  * makes a trace
  */
-char *admin_trace(int sock, int argc, char *argv[])
+const char *admin_trace(int sock, int argc, char *argv[])
 {
 	static struct admin_message msg;
 	int i;
@@ -1630,10 +1632,9 @@ next:
 int main(int argc, char *argv[])
 {
 	int mode;
-	char *socket_name = SOCKET_NAME;
 	int sock, conn;
 	struct sockaddr_un sock_address;
-	char *ret;
+	const char *ret;
 
 
 	/* show options */
@@ -1717,6 +1718,10 @@ int main(int argc, char *argv[])
 		goto usage;
 	}
 
+	if (read_options() == 0) {
+		exit(EXIT_FAILURE);
+	}
+
 //pipeagain:
 	/* open socket */
 	if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
@@ -1725,8 +1730,8 @@ int main(int argc, char *argv[])
 		exit(EXIT_FAILURE);
 	}
 	memset(&sock_address, 0, sizeof(sock_address));
+	SPRINT(sock_address.sun_path, SOCKET_NAME, options.lock);
 	sock_address.sun_family = PF_UNIX;
-	UCPY(sock_address.sun_path, socket_name);
 	if ((conn = connect(sock, (struct sockaddr *)&sock_address, SUN_LEN(&sock_address))) < 0)
 	{
 		close(sock);