projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LCR now runs as a user.
[lcr.git]
/
lcradmin.c
diff --git
a/lcradmin.c
b/lcradmin.c
index
288bebd
..
042a4b0
100644
(file)
--- a/
lcradmin.c
+++ b/
lcradmin.c
@@
-23,6
+23,7
@@
#include <errno.h>
#include <curses.h>
#include "macro.h"
#include <errno.h>
#include <curses.h>
#include "macro.h"
+#include "options.h"
#include "join.h"
#include "joinpbx.h"
#include "extension.h"
#include "join.h"
#include "joinpbx.h"
#include "extension.h"
@@
-739,6
+740,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])
{
@@
-1628,7
+1631,6
@@
next:
int main(int argc, char *argv[])
{
int mode;
int main(int argc, char *argv[])
{
int mode;
- char *socket_name = SOCKET_NAME;
int sock, conn;
struct sockaddr_un sock_address;
char *ret;
int sock, conn;
struct sockaddr_un sock_address;
char *ret;
@@
-1715,6
+1717,10
@@
int main(int argc, char *argv[])
goto usage;
}
goto usage;
}
+ if (read_options() == 0) {
+ exit(EXIT_FAILURE);
+ }
+
//pipeagain:
/* open socket */
if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
//pipeagain:
/* open socket */
if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
@@
-1723,8
+1729,8
@@
int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
memset(&sock_address, 0, sizeof(sock_address));
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;
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);
if ((conn = connect(sock, (struct sockaddr *)&sock_address, SUN_LEN(&sock_address))) < 0)
{
close(sock);