projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed mncc.h for GSM. Audio works again with latest OpenBSC.
[lcr.git]
/
message.h
diff --git
a/message.h
b/message.h
index
f07745c
..
c2076af
100644
(file)
--- a/
message.h
+++ b/
message.h
@@
-9,31
+9,31
@@
** **
\*****************************************************************************/
** **
\*****************************************************************************/
-#define ISDN_TRANSMIT 256 // samples
-
enum { /* interface types */
enum { /* interface types */
- INFO_ITYPE_ISDN,
+ INFO_ITYPE_ISDN,
/* call from external */
INFO_ITYPE_ISDN_EXTENSION, /* call from internal extension */
INFO_ITYPE_CHAN,
INFO_ITYPE_VBOX
};
enum { /* number types */
INFO_ITYPE_ISDN_EXTENSION, /* call from internal extension */
INFO_ITYPE_CHAN,
INFO_ITYPE_VBOX
};
enum { /* number types */
- INFO_NTYPE_UNKNOWN = 0,
+ INFO_NTYPE_NOTPRESENT = 0,
+ INFO_NTYPE_UNKNOWN,
INFO_NTYPE_SUBSCRIBER,
INFO_NTYPE_NATIONAL,
INFO_NTYPE_INTERNATIONAL
};
enum { /* number presentation */
INFO_NTYPE_SUBSCRIBER,
INFO_NTYPE_NATIONAL,
INFO_NTYPE_INTERNATIONAL
};
enum { /* number presentation */
- INFO_PRESENT_N
ULL = 0
,
+ INFO_PRESENT_N
OTAVAIL
,
INFO_PRESENT_ALLOWED,
INFO_PRESENT_ALLOWED,
- INFO_PRESENT_RESTRICTED,
- INFO_PRESENT_NOTAVAIL
+ INFO_PRESENT_RESTRICTED
};
enum { /* number presentation */
INFO_SCREEN_USER, /* user provided */
};
enum { /* number presentation */
INFO_SCREEN_USER, /* user provided */
+ INFO_SCREEN_USER_VERIFIED_PASSED,
+ INFO_SCREEN_USER_VERIFIED_FAILED,
INFO_SCREEN_NETWORK /* network provided */
};
INFO_SCREEN_NETWORK /* network provided */
};
@@
-144,6
+144,10
@@
enum {
B_STATE_REMOTE, /* bchannel assigned to remote application */
B_STATE_IMPORTING, /* BCHANNEL_REMOVE sent */
};
B_STATE_REMOTE, /* bchannel assigned to remote application */
B_STATE_IMPORTING, /* BCHANNEL_REMOVE sent */
};
+enum {
+ B_MODE_TRANSPARENT, /* normal transparent audio */
+ B_MODE_HDLC, /* hdlc data mode */
+};
/* call-info structure CALLER */
struct caller_info {
/* call-info structure CALLER */
struct caller_info {
@@
-157,6
+161,11
@@
struct caller_info {
int present; /* presentation */
int screen; /* who provided the number */
char display[84]; /* display information */
int present; /* presentation */
int screen; /* who provided the number */
char display[84]; /* display information */
+ char id2[32]; /* second callerid */
+ int ntype2; /* second type of number */
+ int present2; /* second presentation */
+ int screen2; /* second who provided the number */
+ char imsi[16]; /* IMSI for gsm originated calls */
};
/* call-info structure DIALING */
};
/* call-info structure DIALING */
@@
-166,6
+175,8
@@
struct dialing_info {
int itype; /* type of interface */
int ntype; /* type of number */
int sending_complete; /* end of dialing */
int itype; /* type of interface */
int ntype; /* type of number */
int sending_complete; /* end of dialing */
+ char display[84]; /* display information */
+ char keypad[33]; /* send keypad facility */
};
/* call-info structure CONNECT */
};
/* call-info structure CONNECT */
@@
-180,6
+191,7
@@
struct connect_info {
int present; /* presentation */
int screen; /* who provided the number */
char display[84]; /* display information */
int present; /* presentation */
int screen; /* who provided the number */
char display[84]; /* display information */
+ char imsi[16]; /* IMSI for gsm terminated calls */
};
/* call-info structure DISCONNECT */
};
/* call-info structure DISCONNECT */
@@
-187,6
+199,7
@@
struct disconnect_info {
int cause; /* reason for disconnect */
int location; /* disconnect location */
char display[84]; /* optional display information */
int cause; /* reason for disconnect */
int location; /* disconnect location */
char display[84]; /* optional display information */
+ int force; /* special flag to release imediately */
};
/* call-info structure REDIR */
};
/* call-info structure REDIR */
@@
-203,6
+216,7
@@
struct redir_info {
/* call-info structure capability */
struct capa_info {
/* call-info structure capability */
struct capa_info {
+ int source_mode; /* forward mode */
int bearer_capa; /* capability */
int bearer_mode; /* circuit/packet */
int bearer_info1; /* alaw,ulaw,... */
int bearer_capa; /* capability */
int bearer_mode; /* circuit/packet */
int bearer_info1; /* alaw,ulaw,... */
@@
-223,6
+237,12
@@
struct notify_info {
int local; /* if set, endpoints gets information about audio channel (open/close) */
};
int local; /* if set, endpoints gets information about audio channel (open/close) */
};
+/* call-info structure PROGRESS */
+struct progress_info {
+ int progress; /* progress indicator */
+ int location; /* progress location */
+};
+
/* call-info structure FACILITY */
struct facility_info {
char data[256]; /* data info about facility */
/* call-info structure FACILITY */
struct facility_info {
char data[256]; /* data info about facility */
@@
-240,7
+260,6
@@
struct useruser_info {
struct message_setup {
int isdn_port; /* card number 1...n (only on calls from isdn port) */
int port_type; /* type of port (only required if message is port -> epoint) */
struct message_setup {
int isdn_port; /* card number 1...n (only on calls from isdn port) */
int port_type; /* type of port (only required if message is port -> epoint) */
- int dtmf; /* used to enabled dtmf dialing at setup state */
int partyline; /* if set, call will be a conference room */
int partyline_jingle; /* if set, the jingle will be played on conference join */
struct caller_info callerinfo; /* information about the caller */
int partyline; /* if set, call will be a conference room */
int partyline_jingle; /* if set, the jingle will be played on conference join */
struct caller_info callerinfo; /* information about the caller */
@@
-248,6
+267,7
@@
struct message_setup {
struct redir_info redirinfo; /* info on redirection (to the calling user) */
struct capa_info capainfo; /* info on l2,l3 capability */
struct useruser_info useruser; /* user-user */
struct redir_info redirinfo; /* info on redirection (to the calling user) */
struct capa_info capainfo; /* info on l2,l3 capability */
struct useruser_info useruser; /* user-user */
+// struct progress_info progress; /* info on call progress */
char context[128]; /* asterisk context */
};
char context[128]; /* asterisk context */
};
@@
-257,10
+277,11
@@
struct park_info {
int len;
};
int len;
};
+#define ISDN_TRANSMIT 256
/* DATA */
struct param_data {
/* DATA */
struct param_data {
- unsigned char data[ISDN_TRANSMIT]; /* audio
/hdlc
data */
- int len; /* audio
/hdlc
data */
+ unsigned char data[ISDN_TRANSMIT]; /* audio data */
+ int len; /* audio data */
};
struct param_play {
};
struct param_play {
@@
-302,7
+323,8
@@
struct param_hello {
struct param_bchannel {
int type; /* BCHANNEL_* */
struct param_bchannel {
int type; /* BCHANNEL_* */
- unsigned long handle; /* bchannel stack/portid */
+ unsigned int handle; /* bchannel stack/portid */
+ int isloopback; /* in this case the application behaves like an interface, dsp should not be used */
int tx_gain, rx_gain;
char pipeline[256];
unsigned char crypt[128];
int tx_gain, rx_gain;
char pipeline[256];
unsigned char crypt[128];
@@
-310,6
+332,11
@@
struct param_bchannel {
int crypt_type; /* 1 = blowfish */
};
int crypt_type; /* 1 = blowfish */
};
+struct param_newref {
+ int direction; /* who requests a refe? */
+ int mode; /* 0 = direct-mode, 1 = PBX mode */
+};
+
/* structure of message parameter */
union parameter {
struct param_tone tone; /* MESSAGE_TONE */
/* structure of message parameter */
union parameter {
struct param_tone tone; /* MESSAGE_TONE */
@@
-319,6
+346,7
@@
union parameter {
struct connect_info connectinfo; /* CONNECT INFO */
struct disconnect_info disconnectinfo; /* DISCONNECT INFO */
struct notify_info notifyinfo; /* some notifications */
struct connect_info connectinfo; /* CONNECT INFO */
struct disconnect_info disconnectinfo; /* DISCONNECT INFO */
struct notify_info notifyinfo; /* some notifications */
+ struct progress_info progressinfo; /* some progress */
struct facility_info facilityinfo; /* some notifications */
struct park_info parkinfo; /* MESSAGE_SUSPEND, MESSAGE_RESUME */
int state; /* MESSAGE_TIMEOUT */
struct facility_info facilityinfo; /* some notifications */
struct park_info parkinfo; /* MESSAGE_SUSPEND, MESSAGE_RESUME */
int state; /* MESSAGE_TIMEOUT */
@@
-333,7
+361,7
@@
union parameter {
struct param_crypt crypt; /* MESSAGE_CRYPT */
struct param_hello hello; /* MESSAGE_HELLO */
struct param_bchannel bchannel; /* MESSAGE_BCHANNEL */
struct param_crypt crypt; /* MESSAGE_CRYPT */
struct param_hello hello; /* MESSAGE_HELLO */
struct param_bchannel bchannel; /* MESSAGE_BCHANNEL */
-
int direction
; /* MESSAGE_NEWREF */
+
struct param_newref newref
; /* MESSAGE_NEWREF */
};
enum { /* message flow */
};
enum { /* message flow */
@@
-348,8
+376,8
@@
struct lcr_msg {
struct lcr_msg *next;
int type; /* type of message */
int flow; /* from where to where */
struct lcr_msg *next;
int type; /* type of message */
int flow; /* from where to where */
- unsigned
long
id_from; /* in case of flow==PORT_TO_EPOINT: id_from is the port's serial, id_to is the epoint's serial */
- unsigned
long
id_to;
+ unsigned
int
id_from; /* in case of flow==PORT_TO_EPOINT: id_from is the port's serial, id_to is the epoint's serial */
+ unsigned
int
id_to;
int keep;
union parameter param;
};
int keep;
union parameter param;
};
@@
-358,6
+386,7
@@
enum { /* messages between entities */
MESSAGE_NONE, /* no message */
MESSAGE_TONE, /* set information tone (to isdn port) */
MESSAGE_DTMF, /* dtmf digit (from isdn port) */
MESSAGE_NONE, /* no message */
MESSAGE_TONE, /* set information tone (to isdn port) */
MESSAGE_DTMF, /* dtmf digit (from isdn port) */
+ MESSAGE_ENABLEKEYPAD, /* remote application requests keypad/dtmf */
MESSAGE_mISDNSIGNAL, /* special mixer command (down to isdn port) */
MESSAGE_SETUP, /* setup message */
MESSAGE_INFORMATION, /* additional digit information */
MESSAGE_mISDNSIGNAL, /* special mixer command (down to isdn port) */
MESSAGE_SETUP, /* setup message */
MESSAGE_INFORMATION, /* additional digit information */
@@
-368,7
+397,8
@@
enum { /* messages between entities */
MESSAGE_DISCONNECT, /* disconnect with cause */
MESSAGE_RELEASE, /* release with cause */
MESSAGE_TIMEOUT, /* protocol state has timed out (port->epoint) */
MESSAGE_DISCONNECT, /* disconnect with cause */
MESSAGE_RELEASE, /* release with cause */
MESSAGE_TIMEOUT, /* protocol state has timed out (port->epoint) */
- MESSAGE_NOTIFY, /* used to send progress and notify infos */
+ MESSAGE_NOTIFY, /* used to send notify info */
+ MESSAGE_PROGRESS, /* used to send progress info */
MESSAGE_FACILITY, /* used to facility infos, like aocd */
MESSAGE_SUSPEND, /* suspend port */
MESSAGE_RESUME, /* resume port */
MESSAGE_FACILITY, /* used to facility infos, like aocd */
MESSAGE_SUSPEND, /* suspend port */
MESSAGE_RESUME, /* resume port */
@@
-392,6
+422,7
@@
enum { /* messages between entities */
"MESSAGE_NONE", \
"MESSAGE_TONE", \
"MESSAGE_DTMF", \
"MESSAGE_NONE", \
"MESSAGE_TONE", \
"MESSAGE_DTMF", \
+ "MESSAGE_ENABLEKEYPAD", \
"MESSAGE_mISDNSIGNAL", \
"MESSAGE_SETUP", \
"MESSAGE_INFORMATION", \
"MESSAGE_mISDNSIGNAL", \
"MESSAGE_SETUP", \
"MESSAGE_INFORMATION", \
@@
-403,6
+434,7
@@
enum { /* messages between entities */
"MESSAGE_RELEASE", \
"MESSAGE_TIMEOUT", \
"MESSAGE_NOTIFY", \
"MESSAGE_RELEASE", \
"MESSAGE_TIMEOUT", \
"MESSAGE_NOTIFY", \
+ "MESSAGE_PROGRESS", \
"MESSAGE_FACILITY", \
"MESSAGE_SUSPEND", \
"MESSAGE_RESUME", \
"MESSAGE_FACILITY", \
"MESSAGE_SUSPEND", \
"MESSAGE_RESUME", \
@@
-428,6
+460,7
@@
void message_put(struct lcr_msg *message);
struct lcr_msg *message_forward(int id_from, int id_to, int flow, union parameter *param);
struct lcr_msg *message_get(void);
void message_free(struct lcr_msg *message);
struct lcr_msg *message_forward(int id_from, int id_to, int flow, union parameter *param);
struct lcr_msg *message_get(void);
void message_free(struct lcr_msg *message);
-
+void init_message(void);
+void cleanup_message(void);