#include "macro.h"
#include "options.h"
#include "join.h"
+#include "select.h"
#include "joinpbx.h"
#include "extension.h"
#include "message.h"
color(white);
SPRINT(buffer,"JOIN(%d)", join);
addstr(buffer);
+ if (m[i].u.j.threepty) {
+ color(cyan);
+ addstr(" 3PTY->");
+ color(white);
+ SPRINT(buffer, "%d\n", m[i].u.j.threepty);
+ addstr(buffer);
+ }
if (m[i].u.j.partyline) {
color(cyan);
addstr(" partyline=");
/* show interface summary */
move(++line>1?line:1, 0);
color(white);
- if (m[i].u.i.block >= 2) {
+ if (m[i].u.i.portnum == -100) {
+ SPRINT(buffer, "%s %s", m[i].u.i.interface_name, (m[i].u.i.extension)?" exten":"");
+ addstr(buffer);
+ } else if (m[i].u.i.block >= 2) {
if (m[i].u.i.portnum < 0)
SPRINT(buffer, "%s (port ?: %s)%s", m[i].u.i.interface_name, m[i].u.i.portname, (m[i].u.i.extension)?" exten":"");
else
color(yellow);
addstr("dact'ing");
break;
- case B_STATE_EXPORTING:
- color(yellow);
- addstr("exp'ing ");
- break;
- case B_STATE_REMOTE:
- color(green);
- addstr("remote ");
- break;
- case B_STATE_IMPORTING:
- color(yellow);
- addstr("imp'ing ");
- break;
}
if (m[i].u.i.port[j]) {
/* search for port */
else
printf("\t status = unblocked\n");
printf("\t mode = %s %s%s%s\n", (m[i].u.i.ntmode)?"NT-mode":"TE-mode", (m[i].u.i.ptp)?"ptp":"ptmp", (m[i].u.i.l1hold)?" l1hold":"", (m[i].u.i.l2hold)?" l2hold":"");
+ printf("\t out-channel = %s\n", m[i].u.i.out_channel);
+ printf("\t in-channel = %s\n", m[i].u.i.in_channel);
if (m[i].u.i.l1link < 0)
printf("\t l1 link = unknown\n");
else
goto next;
case ADMIN_CALL_NOTIFY:
- printf("NOTIFY\n notify=%d\n number=%s\n", msg.u.call.notify, msg.u.call.callerid); fflush(stdout);
+ printf("NOTIFY\n notify=%d\n number=%s\n", msg.u.call.notify_progress, msg.u.call.callerid); fflush(stdout);
+ goto next;
+
+ case ADMIN_CALL_PROGRESS:
+ printf("PROGRESS\n progress=%d\n location=%d\n", msg.u.call.notify_progress, msg.u.call.location); fflush(stdout);
goto next;
case ADMIN_CALL_DISCONNECT:
int sock, conn;
struct sockaddr_un sock_address;
const char *ret = "invalid mode";
-
+ char options_error[256];
/* show options */
if (argc <= 1) {
goto usage;
}
- if (read_options() == 0) {
+ if (read_options(options_error) == 0) {
exit(EXIT_FAILURE);
}