retronetworking
/
chan-capi
mirror of https://github.com/MelwareDE/chan-capi.git
13
0
Fork 0
Code Issues Projects Releases Wiki Activity

- register at CAPI with needed amount of maxChannels instead of fixed 120.

This commit is contained in:
MelwareDE 2007-03-05 20:00:35 +00:00
parent fa94aeac13
commit 0208255abd
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -4,6 +4,8 @@ CHANGES
HEAD
------------------
- added qsig caller-name patch by Mario Goegel
- recognise asterisk 1.4.1
- register at CAPI with needed maxLogicalConnections only
chan_capi-1.0.0
------------------

26
chan_capi.c
View File

@ -5555,7 +5555,7 @@ static const struct ast_channel_tech capi_tech = {
/*
* register at CAPI interface
*/
static int cc_register_capi(unsigned blocksize)
static int cc_register_capi(unsigned blocksize, unsigned connections)
{
u_int16_t error = 0;
@ -5564,13 +5564,13 @@ static int cc_register_capi(unsigned blocksize)
cc_log(LOG_WARNING,"Unable to unregister from CAPI!\n");
}
cc_verbose(3, 0, VERBOSE_PREFIX_3 "Registering at CAPI "
"(blocksize=%d)\n", blocksize);
"(blocksize=%d maxlogicalchannels)\n", blocksize, connections);
#if (CAPI_OS_HINT == 2)
error = capi20_register(CAPI_BCHANS, CAPI_MAX_B3_BLOCKS,
error = capi20_register(connections, CAPI_MAX_B3_BLOCKS,
blocksize, &capi_ApplID, CAPI_STACK_VERSION);
#else
error = capi20_register(CAPI_BCHANS, CAPI_MAX_B3_BLOCKS,
error = capi20_register(connections, CAPI_MAX_B3_BLOCKS,
blocksize, &capi_ApplID);
#endif
if (error != 0) {
@ -5600,7 +5600,7 @@ static int cc_init_capi(void)
return -1;
}
if (cc_register_capi(CAPI_MAX_B3_BLOCK_SIZE))
if (cc_register_capi(CAPI_MAX_B3_BLOCK_SIZE, 2))
return -1;
#if (CAPI_OS_HINT == 1)
@ -5724,20 +5724,24 @@ static int cc_post_init_capi(void)
struct capi_pvt *i;
int controller;
unsigned error;
int use_rtp = 0;
int rtp_ext_size = 0;
unsigned needchannels = 0;
for (i = iflist; i && !use_rtp; i = i->next) {
for (i = iflist; i && !rtp_ext_size; i = i->next) {
/* if at least one line wants RTP, we need to re-register with
bigger block size for RTP-header */
if (capi_controllers[i->controller]->rtpcodec & i->capability) {
cc_verbose(3, 0, VERBOSE_PREFIX_4 "at least one CAPI controller wants RTP.\n");
use_rtp = 1;
rtp_ext_size = RTP_HEADER_SIZE;
}
}
if (use_rtp) {
if (cc_register_capi(CAPI_MAX_B3_BLOCK_SIZE + RTP_HEADER_SIZE))
return -1;
for (controller = 1; controller <= capi_num_controllers; controller++) {
if (capi_controllers[controller] != NULL) {
needchannels += (capi_controllers[controller]->nbchannels + 1);
}
}
if (cc_register_capi(CAPI_MAX_B3_BLOCK_SIZE + rtp_ext_size, needchannels))
return -1;
for (controller = 1; controller <= capi_num_controllers; controller++) {
if (capi_used_controllers & (1 << controller)) {

1
chan_capi.h
View File

@ -28,7 +28,6 @@
/* you can tune this to your need. higher value == more latency */
#define CAPI_MAX_B3_BLOCK_SIZE 160
#define CAPI_BCHANS 120
#define ALL_SERVICES 0x1FFF03FF
#define CAPI_ISDNMODE_MSN 0