automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@72098 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index e10c3ac33cb8404c1ffe31bd9c5363699a1b8960..241c3f6ada544ba9e5ed9186280cac3d68b5db84 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -427,12 +427,41 @@ void misdn_dump_chanlist()
 
 }
 
-static int find_free_chan_in_stack(struct misdn_stack *stack, int channel, int dec)
+int set_chan_in_stack(struct misdn_stack *stack, int channel)
+{
+
+       cb_log(4,stack->port,"set_chan_in_stack: %d\n",channel);
+       dump_chan_list(stack);
+       if (channel >=1 && channel <= MAX_BCHANS) {
+               if (!stack->channels[channel-1])
+                       stack->channels[channel-1] = 1;
+               else {
+                       cb_log(4,stack->port,"channel already in use:%d\n", channel );
+                       return -1;
+               }
+       } else {
+               cb_log(0,stack->port,"couldn't set channel %d in\n", channel );
+               return -1;
+       }
+  
+       return 0;
+}
+
+
+
+static int find_free_chan_in_stack(struct misdn_stack *stack, struct misdn_bchannel *bc, int channel, int dec)
 {
        int i;
+       int chan=0;
+
+       if (bc->channel_found)  
+               return 0;
+       
+       bc->channel_found=1;
 
        cb_log(5,stack->port,"find_free_chan: req_chan:%d\n",channel);
 
+
        if (channel < 0 || channel > MAX_BCHANS) {
                cb_log(0, stack->port, " !! out of bound call to find_free_chan_in_stack! (ch:%d)\n", channel);
                return 0;
@@ -447,7 +476,8 @@ static int find_free_chan_in_stack(struct misdn_stack *stack, int channel, int d
                        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;
+                                       chan=i+1;
+                                       break;
                                }
                        }
                }
@@ -456,15 +486,27 @@ static int find_free_chan_in_stack(struct misdn_stack *stack, int channel, int d
                        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;
+                                       chan=i+1;
+                                       break;
                                }
                        }
                }
        }
 
-       cb_log (1, stack->port, " !! NO FREE CHAN IN STACK\n");
-       dump_chan_list(stack);
-  
+       if (!chan) {
+               cb_log (1, stack->port, " !! NO FREE CHAN IN STACK\n");
+               dump_chan_list(stack);
+               bc->out_cause=34;
+               return -1;
+       }       
+
+       if (set_chan_in_stack(stack, chan)<0) {
+               cb_log (0, stack->port, "Channel Already in use:%d\n", chan);
+               bc->out_cause=44;
+               return -1;
+       }
+
+       bc->channel=chan;
        return 0;
 }
 
@@ -631,6 +673,7 @@ void empty_bc(struct misdn_bchannel *bc)
        bc->out_fac_type=FACILITY_NONE;
        
        bc->te_choose_channel = 0;
+       bc->channel_found= 0;
 }
 
 
@@ -688,26 +731,6 @@ void clear_l3(struct misdn_stack *stack)
        } 
 }
 
-int set_chan_in_stack(struct misdn_stack *stack, int channel)
-{
-
-       cb_log(4,stack->port,"set_chan_in_stack: %d\n",channel);
-       dump_chan_list(stack);
-       if (channel >=1 && channel <= MAX_BCHANS) {
-               if (!stack->channels[channel-1])
-                       stack->channels[channel-1] = 1;
-               else {
-                       cb_log(4,stack->port,"channel already in use:%d\n", channel );
-                       return -1;
-               }
-       } else {
-               cb_log(0,stack->port,"couldn't set channel %d in\n", channel );
-               return -1;
-       }
-  
-       return 0;
-}
-
 int chan_in_stack_free(struct misdn_stack *stack, int channel)
 {
        if (stack->channels[channel-1])
@@ -841,16 +864,10 @@ static int create_process (int midev, struct misdn_bchannel *bc) {
        int l3_id;
        int i;
        struct misdn_stack *stack=get_stack_by_bc(bc);
-       int free_chan;
   
        if (stack->nt) {
-               free_chan = find_free_chan_in_stack(stack, bc->channel_preselected?bc->channel:0, 0);
-               if (!free_chan) return -1;
-               bc->channel=free_chan;
-
-               if (set_chan_in_stack(stack ,bc->channel)<0) return -1;
-               
-               cb_log(4,stack->port, " -->  found channel: %d\n",free_chan);
+               if (find_free_chan_in_stack(stack, bc, bc->channel_preselected?bc->channel:0, 0)<0) return -1;
+               cb_log(4,stack->port, " -->  found channel: %d\n",bc->channel);
     
                for (i=0; i <= MAXPROCS; i++)
                        if (stack->procids[i]==0) break;
@@ -876,11 +893,8 @@ 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 */
-                       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);
-                       if (set_chan_in_stack(stack ,bc->channel)<0) return -1;
+                       if (find_free_chan_in_stack(stack, bc, bc->channel_preselected?bc->channel:0, bc->dec)<0) return -1;
+                       cb_log(2,stack->port, " -->  found channel: %d\n",bc->channel);
                } else {
                        /* other phones could have made a call also on this port (ptmp) */
                        bc->channel=0xff;
@@ -1502,25 +1516,13 @@ int handle_event ( struct misdn_bchannel *bc, enum event_e event, iframe_t *frm)
 
                case EVENT_SETUP:
                {
-                       if (bc->channel == 0xff) {
-                               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;
-                                       misdn_lib_send_event(bc,EVENT_RELEASE_COMPLETE);
-                                       return -1;
-                               }
-                       } 
-
-                       if (bc->channel >0 && bc->channel<255) {
-                               int ret=set_chan_in_stack(stack ,bc->channel);
-                               if (event == EVENT_SETUP && ret<0){
-                                       /* empty bchannel */
-                                       bc->channel=0;
-                                       bc->out_cause=44;
-                                       misdn_lib_send_event(bc,EVENT_RELEASE_COMPLETE);
-                                       return -1;
-                               }
+                       if (bc->channel == 0xff || bc->channel<=0)
+                               bc->channel=0;
+
+                       if (find_free_chan_in_stack(stack, bc, bc->channel, 0)<0){
+                               cb_log(0, stack->port, "Any Channel Requested, but we have no more!!\n");
+                               misdn_lib_send_event(bc,EVENT_RELEASE_COMPLETE);
+                               return -1;
                        }
                }
                break;
@@ -2016,23 +2018,11 @@ 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,0,0);
-               
-                                               if (bc->channel<=0)
-                                                       goto ERR_NO_CHANNEL;
-                                       } else if (!stack->ptp) 
-                                               cb_log(3,stack->port," --> PTMP but channel requested\n"); 
-
-                                       int ret=set_chan_in_stack(stack, bc->channel);
-                                       if (event==EVENT_SETUP && ret<0){
-                                               /* empty bchannel */
+                                       if (bc->channel<=0 || bc->channel==0xff) 
                                                bc->channel=0;
-                                               bc->out_cause=44;
-
+                               
+                                       if (find_free_chan_in_stack(stack,bc, bc->channel,0)<0) 
                                                goto ERR_NO_CHANNEL;
-                                       }
-
                                        break;
                                case EVENT_RELEASE:
                                case EVENT_RELEASE_COMPLETE:
@@ -2638,7 +2628,7 @@ int handle_frm(msg_t *msg)
                                if (tmpcause == 44) {
                                        cb_log(0,stack->port,"**** Received CAUSE:44, so not cleaning up channel %d\n", channel);
                                        cb_log(0,stack->port,"**** This channel is now no longer available,\nplease try to restart it with 'misdn send restart <port> <channel>'\n");
-                                               set_chan_in_stack(stack,bc->channel);
+                                       set_chan_in_stack(stack,bc->channel);
                                } else {
                                        if (channel>0)
                                                empty_chan_in_stack(stack,channel);
@@ -3230,17 +3220,11 @@ 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 */
-                               bc->channel = find_free_chan_in_stack(stack, 0, 0);
-                               if (!bc->channel) {
+                               if (find_free_chan_in_stack(stack, bc, 0, 0)<0) {
                                        cb_log(0, stack->port, " No free channel at the moment\n");
                                        /*FIXME: add disconnect*/
                                        RETURN(-ENOCHAN,OUT);
                                }
-                               
-                               if (set_chan_in_stack(stack ,bc->channel)<0) {
-                                       /*FIXME: add disconnect*/
-                                       RETURN(-ENOCHAN,OUT);
-                               }
                        }
                        /* Its that i generate channels */
                }

diff --git a/channels/misdn/isdn_lib.h b/channels/misdn/isdn_lib.h
index 49b938ed4625c69ccb0ed5dd8dd0da46b46eff34..7d7e17a9ff9409b61f0dae6c6ae5f482fb47b7e4 100644 (file)
--- a/channels/misdn/isdn_lib.h
+++ b/channels/misdn/isdn_lib.h
@@ -364,16 +364,8 @@ struct misdn_bchannel {
        int ec_deftaps;
        int ec_training;
 #endif
-
-#ifdef WITH_BEROEC
-       beroec_t *ec;
-       int bnec_tail;
-       int bnec_ah;
-       int bnec_nlp;
-       int bnec_td;
-       int bnec_adapt;
-       int bnec_zero;
-#endif
+       
+       int channel_found;
        
        int orig;