diff options
author | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-20 13:16:06 +0000 |
---|---|---|
committer | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-20 13:16:06 +0000 |
commit | 6d2b0731ea49c44167befa9bfb7569a446af666a (patch) | |
tree | 36725d4084e93698ebf511e6d9851ef448c68fb6 /channels/misdn | |
parent | 90cf6e4287cdbc83661610a063b3bddc77dd70c1 (diff) |
Merged revisions 58849-58850,59062-59063 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r58849 | crichter | 2007-03-13 12:58:16 +0100 (Di, 13 Mär 2007) | 1 line
added method standard_dec for dialing out on groups, to avoid conflicts, which caused issues with some ISDN providers
........
r58850 | crichter | 2007-03-13 13:58:32 +0100 (Di, 13 Mär 2007) | 1 line
fixed the crypt_keys stuff
........
r59062 | crichter | 2007-03-20 10:18:06 +0100 (Di, 20 Mär 2007) | 1 line
avoid sending a disconnect when we already received one.
........
r59063 | crichter | 2007-03-20 10:23:22 +0100 (Di, 20 Mär 2007) | 1 line
modified a loglevel
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@59064 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/misdn')
-rw-r--r-- | channels/misdn/chan_misdn_config.h | 3 | ||||
-rw-r--r-- | channels/misdn/isdn_lib.c | 82 | ||||
-rw-r--r-- | channels/misdn/isdn_lib.h | 3 |
3 files changed, 57 insertions, 31 deletions
diff --git a/channels/misdn/chan_misdn_config.h b/channels/misdn/chan_misdn_config.h index 8869ead50..3012e8622 100644 --- a/channels/misdn/chan_misdn_config.h +++ b/channels/misdn/chan_misdn_config.h @@ -100,7 +100,8 @@ enum misdn_cfg_elements { enum misdn_cfg_method { METHOD_STANDARD = 0, - METHOD_ROUND_ROBIN + METHOD_ROUND_ROBIN, + METHOD_STANDARD_DEC }; /* you must call misdn_cfg_init before any other function of this header file */ diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index 13e6a8207..3f33176a3 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -431,7 +431,7 @@ static void dump_chan_list(struct misdn_stack *stack) -static int find_free_chan_in_stack(struct misdn_stack *stack, struct misdn_bchannel *bc, int channel) +static int find_free_chan_in_stack(struct misdn_stack *stack, struct misdn_bchannel *bc, int channel, int dec) { int i; @@ -443,14 +443,25 @@ static int find_free_chan_in_stack(struct misdn_stack *stack, struct misdn_bchan } channel--; - - for (i = 0; i < stack->b_num; i++) { - if (i != 15 && (channel < 0 || i == channel)) { /* skip E1 Dchannel ;) and work with chan preselection */ - if (!stack->channels[i]) { - cb_log (3, stack->port, " --> found chan%s: %d\n", channel>=0?" (preselected)":"", i+1); - bc->channel=i+1; - cb_event(EVENT_NEW_CHANNEL, bc, NULL); - return i+1; + + if (dec) { + for (i = stack->b_num-1; i >=0; i--) { + if (i != 15 && (channel < 0 || i == channel)) { /* skip E1 Dchannel ;) and work with chan preselection */ + if (!stack->channels[i]) { + cb_log (3, stack->port, " --> found chan%s: %d\n", channel>=0?" (preselected)":"", i+1); + bc->channel=i+1; + return i+1; + } + } + } + } else { + for (i = 0; i < stack->b_num; i++) { + if (i != 15 && (channel < 0 || i == channel)) { /* skip E1 Dchannel ;) and work with chan preselection */ + if (!stack->channels[i]) { + cb_log (3, stack->port, " --> found chan%s: %d\n", channel>=0?" (preselected)":"", i+1); + bc->channel=i+1; + return i+1; + } } } } @@ -541,6 +552,7 @@ static void empty_bc(struct misdn_bchannel *bc) bc->in_use= 0; bc->cw= 0; + bc->dec=0; bc->channel = 0; bc->sending_complete = 0; @@ -689,7 +701,7 @@ static int set_chan_in_stack(struct misdn_stack *stack, int channel) if (!stack->channels[channel-1]) stack->channels[channel-1] = 1; else { - cb_log(0,stack->port,"channel already in use:%d\n", channel ); + cb_log(4,stack->port,"channel already in use:%d\n", channel ); return -1; } } else { @@ -837,7 +849,7 @@ static int create_process (int midev, struct misdn_bchannel *bc) { struct misdn_stack *stack=get_stack_by_bc(bc); if (stack->nt) { - if (!find_free_chan_in_stack(stack, bc, bc->channel_preselected ? bc->channel : 0)) + if (!find_free_chan_in_stack(stack, bc, bc->channel_preselected ? bc->channel : 0, 0)) return -1; /*bc->channel=free_chan;*/ @@ -869,10 +881,11 @@ static int create_process (int midev, struct misdn_bchannel *bc) { } else { if (stack->ptp || bc->te_choose_channel) { /* we know exactly which channels are in use */ - if (!find_free_chan_in_stack(stack, bc, bc->channel_preselected ? bc->channel : 0)) + if (!find_free_chan_in_stack(stack, bc, bc->channel_preselected ? bc->channel : 0, 0)) return -1; /*bc->channel=free_chan;*/ cb_log(2,stack->port, " --> found channel: %d\n", bc->channel); + if (set_chan_in_stack(stack ,bc->channel)<0) return -1; } else { /* other phones could have made a call also on this port (ptmp) */ @@ -1508,7 +1521,7 @@ static int handle_event ( struct misdn_bchannel *bc, enum event_e event, iframe_ case EVENT_SETUP: { if (bc->channel == 0xff) { - if (!find_free_chan_in_stack(stack, bc, 0)) { + if (!find_free_chan_in_stack(stack, bc, 0, 0)) { cb_log(0, stack->port, "Any Channel Requested, but we have no more!!\n"); bc->out_cause=34; misdn_lib_send_event(bc,EVENT_RELEASE_COMPLETE); @@ -1557,7 +1570,7 @@ static int handle_cr ( struct misdn_stack *stack, iframe_t *frm) case CC_NEW_CR|INDICATION: cb_log(7, stack->port, " --> lib: NEW_CR Ind with l3id:%x on this port.\n",frm->dinfo); - struct misdn_bchannel* bc=misdn_lib_get_free_bc(stack->port, 0, 1); + struct misdn_bchannel* bc=misdn_lib_get_free_bc(stack->port, 0, 1, 0); if (!bc) { cb_log(0, stack->port, " --> !! lib: No free channel!\n"); return -1; @@ -1795,7 +1808,7 @@ handle_event_nt(void *dat, void *arg) case CC_SETUP|INDICATION: { - struct misdn_bchannel* bc=misdn_lib_get_free_bc(stack->port, 0, 1); + struct misdn_bchannel* bc=misdn_lib_get_free_bc(stack->port, 0, 1, 0); if (!bc) ERR_NO_CHANNEL: { @@ -2039,8 +2052,7 @@ handle_event_nt(void *dat, void *arg) switch (event) { case EVENT_SETUP: if (bc->channel<=0 || bc->channel==0xff) { - bc->channel=find_free_chan_in_stack(stack,bc, 0); - + bc->channel=find_free_chan_in_stack(stack,bc, 0,0); if (bc->channel<=0) goto ERR_NO_CHANNEL; } else if (!stack->ptp) @@ -3057,7 +3069,7 @@ static void prepare_bc(struct misdn_bchannel*bc, int channel) #endif } -struct misdn_bchannel* misdn_lib_get_free_bc(int port, int channel, int inout) +struct misdn_bchannel* misdn_lib_get_free_bc(int port, int channel, int inout, int dec) { struct misdn_stack *stack; int i; @@ -3090,17 +3102,29 @@ struct misdn_bchannel* misdn_lib_get_free_bc(int port, int channel, int inout) } int maxnum=inout&&!stack->pri&&!stack->ptp?stack->b_num+1:stack->b_num; - //int maxnum=stack->b_num+1; - cb_log(0,0,"maxnum:%d",maxnum); - for (i = 0; i <maxnum; i++) { - if (!stack->bc[i].in_use) { - /* 3. channel on bri means CW*/ - if (!stack->pri && i==stack->b_num) - stack->bc[i].cw=1; - - prepare_bc(&stack->bc[i], channel); - return &stack->bc[i]; + if (dec) { + for (i = maxnum-1; i>=0; i--) { + if (!stack->bc[i].in_use) { + /* 3. channel on bri means CW*/ + if (!stack->pri && i==stack->b_num) + stack->bc[i].cw=1; + + prepare_bc(&stack->bc[i], channel); + stack->bc[i].dec=1; + return &stack->bc[i]; + } + } + } else { + for (i = 0; i <maxnum; i++) { + if (!stack->bc[i].in_use) { + /* 3. channel on bri means CW*/ + if (!stack->pri && i==stack->b_num) + stack->bc[i].cw=1; + + prepare_bc(&stack->bc[i], channel); + return &stack->bc[i]; + } } } @@ -3222,7 +3246,7 @@ int misdn_lib_send_event(struct misdn_bchannel *bc, enum event_e event ) if (stack->nt) { if (bc->channel <=0 ) { /* else we have the channel already */ - if (!find_free_chan_in_stack(stack, bc, 0)) { + if (!find_free_chan_in_stack(stack, bc, 0,0)) { cb_log(0, stack->port, " No free channel at the moment\n"); /*FIXME: add disconnect*/ err=-ENOCHAN; diff --git a/channels/misdn/isdn_lib.h b/channels/misdn/isdn_lib.h index cc2ea45b8..5100ff38c 100644 --- a/channels/misdn/isdn_lib.h +++ b/channels/misdn/isdn_lib.h @@ -214,6 +214,7 @@ struct misdn_bchannel { int need_release; int need_release_complete; + int dec; /** var stuff**/ int l3_id; int pid; @@ -395,7 +396,7 @@ char *manager_isdn_get_info(enum event_e event); void misdn_lib_transfer(struct misdn_bchannel* holded_bc); -struct misdn_bchannel* misdn_lib_get_free_bc(int port, int channel, int inout); +struct misdn_bchannel* misdn_lib_get_free_bc(int port, int channel, int inout, int dec); void manager_bchannel_activate(struct misdn_bchannel *bc); void manager_bchannel_deactivate(struct misdn_bchannel * bc); |