[svn-commits] crichter: branch 1.2 r58849 - in
/branches/1.2/channels: ./ misdn/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Tue Mar 13 04:58:17 MST 2007
Author: crichter
Date: Tue Mar 13 06:58:16 2007
New Revision: 58849
URL: http://svn.digium.com/view/asterisk?view=rev&rev=58849
Log:
added method standard_dec for dialing out on groups, to avoid conflicts, which caused issues with some ISDN providers
Modified:
branches/1.2/channels/chan_misdn.c
branches/1.2/channels/misdn/chan_misdn_config.h
branches/1.2/channels/misdn/isdn_lib.c
branches/1.2/channels/misdn/isdn_lib.h
branches/1.2/channels/misdn_config.c
Modified: branches/1.2/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_misdn.c?view=diff&rev=58849&r1=58848&r2=58849
==============================================================================
--- branches/1.2/channels/chan_misdn.c (original)
+++ branches/1.2/channels/chan_misdn.c Tue Mar 13 06:58:16 2007
@@ -2526,6 +2526,7 @@
char *tokb=NULL, *p=NULL;
int channel=0, port=0;
struct misdn_bchannel *newbc = NULL;
+ int dec=0;
struct chan_list *cl=init_chan_list(ORG_AST);
@@ -2554,23 +2555,27 @@
else {
port = atoi(port_str);
}
-
-
} else {
ast_log(LOG_WARNING, " --> ! IND : CALL dad:%s WITHOUT PORT/Group, check extension.conf\n",ext);
return NULL;
}
+ if (misdn_cfg_is_group_method(group, METHOD_STANDARD_DEC)) {
+ chan_misdn_log(0, port, " --> STARTING STANDARDDEC...\n");
+ dec=1;
+ }
+
if (!ast_strlen_zero(group)) {
char cfg_group[BUFFERSIZE+1];
struct robin_list *rr = NULL;
if (misdn_cfg_is_group_method(group, METHOD_ROUND_ROBIN)) {
- chan_misdn_log(4, port, " --> STARTING ROUND ROBIN...");
+ chan_misdn_log(4, port, " --> STARTING ROUND ROBIN...\n");
rr = get_robin_position(group);
}
+
if (rr) {
int robin_channel = rr->channel;
int port_start;
@@ -2612,7 +2617,7 @@
if ( port_up>0 ) {
- newbc = misdn_lib_get_free_bc(port, robin_channel,0);
+ newbc = misdn_lib_get_free_bc(port, robin_channel,0, 0);
if (newbc) {
chan_misdn_log(4, port, " Success! Found port:%d channel:%d\n", newbc->port, newbc->channel);
if (port_up)
@@ -2628,9 +2633,7 @@
if (!newbc)
chan_misdn_log(-1, port, " Failed! No free channel in group %d!", group);
- }
-
- else {
+ } else {
for (port=misdn_cfg_get_next_port(0); port > 0;
port=misdn_cfg_get_next_port(port)) {
@@ -2646,18 +2649,17 @@
chan_misdn_log(4, port, "portup:%d\n", port_up);
if ( port_up>0 ) {
- newbc = misdn_lib_get_free_bc(port, 0, 0);
+ newbc = misdn_lib_get_free_bc(port, 0, 0, dec);
if (newbc)
break;
}
}
}
}
-
} else {
if (channel)
chan_misdn_log(1, port," --> preselected_channel: %d\n",channel);
- newbc = misdn_lib_get_free_bc(port, channel, 0);
+ newbc = misdn_lib_get_free_bc(port, channel, 0, dec);
}
if (!newbc) {
Modified: branches/1.2/channels/misdn/chan_misdn_config.h
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/misdn/chan_misdn_config.h?view=diff&rev=58849&r1=58848&r2=58849
==============================================================================
--- branches/1.2/channels/misdn/chan_misdn_config.h (original)
+++ branches/1.2/channels/misdn/chan_misdn_config.h Tue Mar 13 06:58:16 2007
@@ -81,7 +81,8 @@
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 */
Modified: branches/1.2/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/misdn/isdn_lib.c?view=diff&rev=58849&r1=58848&r2=58849
==============================================================================
--- branches/1.2/channels/misdn/isdn_lib.c (original)
+++ branches/1.2/channels/misdn/isdn_lib.c Tue Mar 13 06:58:16 2007
@@ -417,7 +417,7 @@
-static int find_free_chan_in_stack(struct misdn_stack *stack, int channel)
+static int find_free_chan_in_stack(struct misdn_stack *stack, int channel, int dec)
{
int i;
@@ -429,12 +429,23 @@
}
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);
- 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);
+ 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);
+ return i+1;
+ }
}
}
}
@@ -525,6 +536,7 @@
bc->in_use= 0;
bc->cw= 0;
+ bc->dec=0;
bc->channel = 0;
bc->sending_complete = 0;
@@ -671,7 +683,7 @@
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 {
@@ -818,7 +830,7 @@
int free_chan;
if (stack->nt) {
- free_chan = find_free_chan_in_stack(stack, bc->channel_preselected?bc->channel:0);
+ free_chan = find_free_chan_in_stack(stack, bc->channel_preselected?bc->channel:0, 0);
if (!free_chan) return -1;
bc->channel=free_chan;
@@ -850,7 +862,7 @@
} else {
if (stack->ptp || bc->te_choose_channel) {
/* we know exactly which channels are in use */
- free_chan = find_free_chan_in_stack(stack, bc->channel_preselected?bc->channel:0);
+ free_chan = find_free_chan_in_stack(stack, bc->channel_preselected?bc->channel:0, bc->dec);
if (!free_chan) return -1;
bc->channel=free_chan;
cb_log(2,stack->port, " --> found channel: %d\n",free_chan);
@@ -1480,7 +1492,7 @@
case EVENT_SETUP:
{
if (bc->channel == 0xff) {
- bc->channel=find_free_chan_in_stack(stack, 0);
+ bc->channel=find_free_chan_in_stack(stack, 0, 0);
if (!bc->channel) {
cb_log(0, stack->port, "Any Channel Requested, but we have no more!!\n");
bc->out_cause=34;
@@ -1531,7 +1543,7 @@
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;
@@ -1787,7 +1799,7 @@
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:
{
@@ -2032,7 +2044,7 @@
switch (event) {
case EVENT_SETUP:
if (bc->channel<=0 || bc->channel==0xff) {
- bc->channel=find_free_chan_in_stack(stack,0);
+ bc->channel=find_free_chan_in_stack(stack,0,0);
if (bc->channel<=0)
goto ERR_NO_CHANNEL;
@@ -3031,7 +3043,7 @@
#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;
@@ -3064,14 +3076,29 @@
}
int maxnum=inout&&!stack->pri&&!stack->ptp?stack->b_num+1:stack->b_num;
- 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];
+ }
}
}
@@ -3193,7 +3220,7 @@
if (stack->nt) {
if (bc->channel <=0 ) { /* else we have the channel already */
- bc->channel = find_free_chan_in_stack(stack, 0);
+ bc->channel = find_free_chan_in_stack(stack, 0, 0);
if (!bc->channel) {
cb_log(0, stack->port, " No free channel at the moment\n");
/*FIXME: add disconnect*/
Modified: branches/1.2/channels/misdn/isdn_lib.h
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/misdn/isdn_lib.h?view=diff&rev=58849&r1=58848&r2=58849
==============================================================================
--- branches/1.2/channels/misdn/isdn_lib.h (original)
+++ branches/1.2/channels/misdn/isdn_lib.h Tue Mar 13 06:58:16 2007
@@ -228,6 +228,7 @@
int need_release;
int need_release_complete;
+ int dec;
/** var stuff**/
int l3_id;
int pid;
@@ -402,7 +403,7 @@
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);
Modified: branches/1.2/channels/misdn_config.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/misdn_config.c?view=diff&rev=58849&r1=58848&r2=58849
==============================================================================
--- branches/1.2/channels/misdn_config.c (original)
+++ branches/1.2/channels/misdn_config.c Tue Mar 13 06:58:16 2007
@@ -349,9 +349,12 @@
int misdn_cfg_is_group_method (char *group, enum misdn_cfg_method meth)
{
int i, re = 0;
- char *method = NULL;
+ char *method ;
misdn_cfg_lock();
+
+ method = port_cfg[0][map[MISDN_CFG_METHOD]].str;
+
for (i = 1; i <= max_ports; i++) {
if (port_cfg[i] && port_cfg[i][map[MISDN_CFG_GROUPNAME]].str) {
if (!strcasecmp(port_cfg[i][map[MISDN_CFG_GROUPNAME]].str, group))
@@ -359,11 +362,14 @@
port_cfg[i][map[MISDN_CFG_METHOD]].str : port_cfg[0][map[MISDN_CFG_METHOD]].str);
}
}
+
if (method) {
switch (meth) {
case METHOD_STANDARD: re = !strcasecmp(method, "standard");
break;
case METHOD_ROUND_ROBIN: re = !strcasecmp(method, "round_robin");
+ break;
+ case METHOD_STANDARD_DEC: re = !strcasecmp(method, "standard_dec");
break;
}
}
More information about the svn-commits
mailing list