X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=message.h;h=82df9d51d146ba495428230c9207be47fd04e3c8;hp=a1f5bafed0694d8e96c913100aa0f548a30b16c7;hb=e1e9da7d24ccce07ae54d671cde5e07dfc827e25;hpb=acc5e55f7f38429822af3a245a13bec8ec2f5827 diff --git a/message.h b/message.h index a1f5baf..82df9d5 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 */ }; @@ -122,7 +122,6 @@ enum { /* diversion types */ enum { /* isdnsignal */ mISDNSIGNAL_VOLUME, /* change volume */ mISDNSIGNAL_CONF, /* joint/split conference */ - mISDNSIGNAL_JOINDATA, /* data required by join instance */ mISDNSIGNAL_ECHO, /* enable/disable echoe */ mISDNSIGNAL_DELAY, /* use delay or adaptive jitter */ }; @@ -144,6 +143,28 @@ 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 */ +}; + +enum { + MEDIA_TYPE_ALAW = 1, + MEDIA_TYPE_ULAW, + MEDIA_TYPE_GSM, + MEDIA_TYPE_GSM_EFR, + MEDIA_TYPE_AMR, + MEDIA_TYPE_GSM_HR, +}; + +/* rtp-info structure */ +struct rtp_info { + int payloads; /* number of payloads offered */ + unsigned char payload_types[32];/* rtp payload types */ + int media_types[32]; /* media type of given payload */ + unsigned int ip; /* peer's IP */ + unsigned short port; /* peer's port */ +}; /* call-info structure CALLER */ struct caller_info { @@ -157,6 +178,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 */ @@ -167,6 +193,7 @@ struct dialing_info { 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 */ @@ -181,6 +208,8 @@ 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 */ + struct rtp_info rtpinfo; /* info about RTP peer */ }; /* call-info structure DISCONNECT */ @@ -188,6 +217,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 */ @@ -204,6 +234,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,... */ @@ -224,6 +255,13 @@ 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 */ + struct rtp_info rtpinfo; /* info about RTP peer */ +}; + /* call-info structure FACILITY */ struct facility_info { char data[256]; /* data info about facility */ @@ -248,6 +286,8 @@ 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 */ + struct rtp_info rtpinfo; /* info about RTP peer */ char context[128]; /* asterisk context */ }; @@ -257,12 +297,6 @@ struct park_info { int len; }; -/* DATA */ -struct param_data { - unsigned char data[ISDN_TRANSMIT]; /* audio/hdlc data */ - int len; /* audio/hdlc data */ -}; - struct param_play { char file[512]; /* file name */ int offset; /* offset to start file at (in seconds) */ @@ -283,7 +317,6 @@ struct param_mISDNsignal { int tx_gain; int rx_gain; int conf; - int joindata; int tone; int echo; int delay; @@ -303,6 +336,7 @@ struct param_hello { struct param_bchannel { int type; /* BCHANNEL_* */ 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]; @@ -310,6 +344,11 @@ struct param_bchannel { 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 */ @@ -319,12 +358,12 @@ 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 */ int knock; /* MESSAGE_KNOCK 0=off !0=on */ int audiopath; /* MESSAGE_audiopath see RELATION_CHANNEL_* (join.h) */ - struct param_data data; /* MESSAGE_DATA */ struct param_play play; /* MESSAGE_VBOX_PLAY */ int speed; /* MESSAGE_VBOX_PLAY_SPEED */ struct param_counter counter; /* MESSAGE_TONE_COUNTER */ @@ -333,7 +372,8 @@ union parameter { 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 */ + unsigned int bridge_id; /* MESSAGE_BRIDGE */ }; enum { /* message flow */ @@ -369,16 +409,15 @@ 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 */ MESSAGE_AUDIOPATH, /* set status of audio path to endpoint (to call, audio is also set) */ -// MESSAGE_REMOTE_AUDIO, /* tell remote to set audio status */ MESSAGE_PATTERN, /* pattern information tones available */ MESSAGE_NOPATTERN, /* pattern information tones unavailable */ MESSAGE_CRYPT, /* encryption message */ - MESSAGE_DATA, /* audio/hdlc data */ MESSAGE_VBOX_PLAY, /* play recorded file */ MESSAGE_VBOX_PLAY_SPEED,/* change speed of file */ MESSAGE_VBOX_TONE, /* set answering VBOX tone */ @@ -387,6 +426,7 @@ enum { /* messages between entities */ MESSAGE_BCHANNEL, /* request/assign/remove bchannel */ MESSAGE_HELLO, /* hello message for remote application */ MESSAGE_NEWREF, /* special message to create and inform ref */ + MESSAGE_BRIDGE, /* control port bridge */ }; #define MESSAGES static const char *messages_txt[] = { \ @@ -405,15 +445,14 @@ enum { /* messages between entities */ "MESSAGE_RELEASE", \ "MESSAGE_TIMEOUT", \ "MESSAGE_NOTIFY", \ + "MESSAGE_PROGRESS", \ "MESSAGE_FACILITY", \ "MESSAGE_SUSPEND", \ "MESSAGE_RESUME", \ "MESSAGE_AUDIOPATH", \ -/* "MESSAGE_REMOTE_AUDIO",*/ \ "MESSAGE_PATTERN", \ "MESSAGE_NOPATTERN", \ "MESSAGE_CRYPT", \ - "MESSAGE_DATA", \ "MESSAGE_VBOX_PLAY", \ "MESSAGE_VBOX_PLAY_SPEED", \ "MESSAGE_VBOX_TONE", \ @@ -422,14 +461,17 @@ enum { /* messages between entities */ "MESSAGE_BCHANNEL", \ "MESSAGE_HELLO", \ "MESSAGE_NEWREF", \ + "MESSAGE_BRIDGE", \ }; struct lcr_msg *message_create(int id_from, int id_to, int flow, int type); -void message_put(struct lcr_msg *message); +#define message_put(m) _message_put(m, __FILE__, __LINE__) +void _message_put(struct lcr_msg *message, const char *file, int line); 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);