X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=lcrsocket.h;h=f52dd7eef700b4251a87a3a28b66b28e38785fda;hp=19fa835dfcfad6f63ae7da1f156eb83a33c79275;hb=refs%2Fheads%2Fbackup2;hpb=16488a01568e7c35d0e7adf46fdfee5e488df8d8

diff --git a/lcrsocket.h b/lcrsocket.h
index 19fa835..f52dd7e 100644
--- a/lcrsocket.h
+++ b/lcrsocket.h
@@ -9,7 +9,7 @@
 **                                                                           **
 \*****************************************************************************/
 
-#define SOCKET_NAME "/var/run/LCR.socket"
+#define SOCKET_NAME "%s/LCR.socket"
 
 /* structures that define message between admin-tool and pbx */
 
@@ -39,6 +39,7 @@ enum { /* messages */
 	ADMIN_CALL_DISCONNECT,
 	ADMIN_CALL_RELEASE,
 	ADMIN_CALL_NOTIFY,
+	ADMIN_CALL_PROGRESS,
 	ADMIN_TRACE_REQUEST,
 	ADMIN_TRACE_RESPONSE,
 	ADMIN_MESSAGE,
@@ -65,18 +66,25 @@ struct admin_response_state {
 struct admin_response_interface {
 	char		interface_name[32];
 	int		portnum;
+	char		portname[64];
 	int		block;
 	int		ntmode;
 	int		ptp;
+	int		l1hold;
+	int		l2hold;
 	int		pri;
 	int		extension;
 	int		use; /* number of ports that use this interface */
 	int		l1link; /* down(0) or up(1) */
 	int		l2link; /* down(0) or up(1) */
+	unsigned char	l2mask[16]; /* one bit for each tei */
 	int		los, ais, rdi, slip_tx, slip_rx;
 	int		channels;
 	char		busy[256]; /* if port is idle(0) busy(1) */
-	unsigned long	port[256]; /* current port */
+	unsigned int	port[256]; /* current port */
+	int		mode[256];
+	char		out_channel[256];
+	char		in_channel[256];
 };
 
 struct admin_response_remote {
@@ -84,14 +92,15 @@ struct admin_response_remote {
 };
 
 struct admin_response_join {
-	unsigned long	serial; /* join serial number */
+	unsigned int	serial; /* join serial number */
 	char		remote[32]; /* remote application name */
-	unsigned long	partyline;
+	unsigned int	partyline;
+	unsigned int	threepty;
 };
 
 struct admin_response_epoint {
-	unsigned long	serial;
-	unsigned long	join; /* link to join */
+	unsigned int	serial;
+	unsigned int	join; /* link to join */
 //	int		join_notify; /* if relation notified on hold */
 //	int		join_hold; /* if relation on hold */
 	int		rx_state;
@@ -108,9 +117,9 @@ struct admin_response_epoint {
 };
 
 struct admin_response_port {
-	unsigned long	serial; /* port serial number */
+	unsigned int	serial; /* port serial number */
 	char		name[64]; /* name of port */
-	unsigned long	epoint; /* link to epoint */
+	unsigned int	epoint; /* link to epoint */
 	int		state;
 	int		isdn; /* if port is isdn */
 	int		isdn_chan; /* bchannel number */
@@ -125,7 +134,7 @@ struct admin_call {
 	int		present; /* presentation */
 	int		cause; /* cause to send */
 	int		location;
-	int		notify;
+	int		notify_progress;
 	int		bc_capa;
 	int		bc_mode;
 	int		bc_info1;
@@ -148,7 +157,7 @@ struct admin_trace_rsp {
 
 struct admin_msg {
 	int		type; /* type of message */
-	unsigned long	ref; /* reference to individual endpoints */
+	unsigned int	ref; /* reference to individual endpoints */
 	union parameter	param; /* parameter union */
 };
 
@@ -183,4 +192,5 @@ enum {
 	ADMIN_STATE_CONNECT,
 	ADMIN_STATE_IN_DISCONNECT,
 	ADMIN_STATE_OUT_DISCONNECT,
+	ADMIN_STATE_RELEASE,
 };