X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=message.h;h=471e2c8eccd5ea5f86c748acd7b50c56b8139f66;hp=c84ab1947e56adcc090b378dc9c13f4d70198eae;hb=46d07c5968b7de37943182f85499b30735145e03;hpb=cbc232643c7b26d64204ba7f6151007e9c0267e4 diff --git a/message.h b/message.h index c84ab19..471e2c8 100644 --- a/message.h +++ b/message.h @@ -9,31 +9,31 @@ ** ** \*****************************************************************************/ -#define ISDN_TRANSMIT 256 // samples - 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_NTYPE_UNKNOWN = 0, + INFO_NTYPE_NOTPRESENT = 0, + INFO_NTYPE_UNKNOWN, INFO_NTYPE_SUBSCRIBER, INFO_NTYPE_NATIONAL, INFO_NTYPE_INTERNATIONAL }; enum { /* number presentation */ - INFO_PRESENT_NULL = 0, + INFO_PRESENT_NOTAVAIL, INFO_PRESENT_ALLOWED, - INFO_PRESENT_RESTRICTED, - INFO_PRESENT_NOTAVAIL + INFO_PRESENT_RESTRICTED }; enum { /* number presentation */ INFO_SCREEN_USER, /* user provided */ + INFO_SCREEN_USER_VERIFIED_PASSED, + INFO_SCREEN_USER_VERIFIED_FAILED, INFO_SCREEN_NETWORK /* network provided */ }; @@ -144,6 +144,10 @@ enum { 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 { @@ -157,6 +161,11 @@ struct caller_info { 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 */ @@ -166,6 +175,8 @@ struct dialing_info { 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 */ @@ -180,6 +191,7 @@ struct connect_info { 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 */ @@ -187,6 +199,7 @@ struct disconnect_info { 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 */ @@ -203,6 +216,7 @@ struct redir_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,... */ @@ -223,6 +237,12 @@ struct notify_info { 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 */ @@ -247,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 progress_info progress; /* info on call progress */ char context[128]; /* asterisk context */ }; @@ -256,10 +277,11 @@ struct park_info { int len; }; +#define ISDN_TRANSMIT 256 /* 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 { @@ -301,7 +323,7 @@ struct param_hello { struct param_bchannel { int type; /* BCHANNEL_* */ - unsigned long handle; /* bchannel stack/portid */ + unsigned int handle; /* bchannel stack/portid */ int tx_gain, rx_gain; char pipeline[256]; unsigned char crypt[128]; @@ -318,6 +340,7 @@ union parameter { 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 */ @@ -347,8 +370,8 @@ struct lcr_msg { 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; }; @@ -368,7 +391,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_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 */ @@ -429,6 +453,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); - +void init_message(void); +void cleanup_message(void);