[asterisk-commits] crichter: branch 1.2 r70341 - in /branches/1.2/channels: ./ misdn/

[SVN commits to the Asterisk project]

Author: crichter
Date: Wed Jun 20 10:29:09 2007
New Revision: 70341

URL: http://svn.digium.com/view/asterisk?view=rev&rev=70341
Log:
fixed a bug that was introduced by copy and paste in the last commit ..bchannels weren't cleaned properly.

Modified:
    branches/1.2/channels/chan_misdn.c
    branches/1.2/channels/misdn/isdn_lib.c
    branches/1.2/channels/misdn/isdn_lib.h

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=70341&r1=70340&r2=70341
==============================================================================
--- branches/1.2/channels/chan_misdn.c (original)
+++ branches/1.2/channels/chan_misdn.c Wed Jun 20 10:29:09 2007
@@ -988,7 +988,7 @@
 		}
 	}
   
-  
+ 	misdn_dump_chanlist();
 	return 0;
 }
 

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=70341&r1=70340&r2=70341
==============================================================================
--- branches/1.2/channels/misdn/isdn_lib.c (original)
+++ branches/1.2/channels/misdn/isdn_lib.c Wed Jun 20 10:29:09 2007
@@ -413,12 +413,19 @@
 	int i;
 
 	for (i=0; i <= stack->b_num; i++) {
-		cb_log(6, stack->port, "Idx:%d stack->cchan:%d Chan:%d\n",i,stack->channels[i], i+1);
-	}
-}
-
-
-
+		cb_log(6, stack->port, "Idx:%d stack->cchan:%d in_use:%d Chan:%d\n",i,stack->channels[i], stack->bc[i].in_use, i+1);
+	}
+}
+
+
+void misdn_dump_chanlist()
+{
+	struct misdn_stack *stack=get_misdn_stack();
+	for ( ; stack; stack=stack->next) {
+		dump_chan_list(stack);
+	}
+
+}
 
 static int find_free_chan_in_stack(struct misdn_stack *stack, int channel, int dec)
 {
@@ -658,7 +665,6 @@
 	mISDN_write_frame(stack->midev, buff, bc->layer_id|FLG_MSG_TARGET|FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
 	
 	bc->b_stid = 0;
-	bc->in_use = 0;
 	bc_state_change(bc, BCHAN_CLEANED);
 	
 	return ret;
@@ -676,6 +682,7 @@
 			empty_chan_in_stack(stack,i+1);
 			empty_bc(&stack->bc[i]);
 			clean_up_bc(&stack->bc[i]);
+			stack->bc[i].in_use = 0;
 		}
 		
 	} 
@@ -1585,7 +1592,8 @@
 				clean_up_bc(bc);
 
 				if (channel>0)
-					empty_chan_in_stack(stack,bc->channel);
+					empty_chan_in_stack(stack,channel);
+				bc->in_use=0;
 
 				dump_chan_list(stack);
 
@@ -1619,11 +1627,12 @@
 		return;
 	}
 	
-	if (bc->channel>0) {
+	if (bc->channel>0) 
 		empty_chan_in_stack(stack,bc->channel);
-	}
+	
 	empty_bc(bc);
 	clean_up_bc(bc);
+	bc->in_use=0;
 }
 
 
@@ -2062,7 +2071,7 @@
 					break;
 				case EVENT_RELEASE:
 				case EVENT_RELEASE_COMPLETE:
-				{
+					{
 					int channel=bc->channel;
 					int tmpcause=bc->cause;	
 			                empty_bc(bc);
@@ -2070,7 +2079,8 @@
 					clean_up_bc(bc);
 
 					if (channel>0)
-                        			empty_chan_in_stack(stack, bc->channel);
+                        			empty_chan_in_stack(stack,channel);
+					bc->in_use=0;
 					}
 					break;
 
@@ -2639,8 +2649,6 @@
 					bc->in_use=0;
 
 					cb_log(0, stack->port, "GOT IGNORE SETUP\n");
-
-					
 					break;
 				case RESPONSE_OK:
 					cb_log(4, stack->port, "GOT SETUP OK\n");
@@ -2668,8 +2676,9 @@
 						set_chan_in_stack(stack,bc->channel);
 				} else {
 					if (channel>0)
-						empty_chan_in_stack(stack,bc->channel);
+						empty_chan_in_stack(stack,channel);
 				}
+				bc->in_use=0;
 			}
 
 			cb_log(5, stack->port, "Freeing Msg on prim:%x \n",frm->prim);
@@ -3339,7 +3348,9 @@
 			clean_up_bc(bc);
 
 			if (channel>0)
-				empty_chan_in_stack(stack,bc->channel);
+				empty_chan_in_stack(stack,channel);
+
+			bc->in_use=0;	
 		}
 		
 	}
@@ -3384,6 +3395,8 @@
 			
 			if (channel>0)
 				empty_chan_in_stack(stack,bc->channel);
+			
+			bc->in_use=0;
 		}
 		break;
     
@@ -3681,9 +3694,11 @@
 			if (stack->bc[cnt].channel == i) {
 				empty_bc(&stack->bc[cnt]);
 				clean_up_bc(&stack->bc[cnt]);
+				stack->bc[cnt].in_use=0;
 			}
 		}
 		empty_chan_in_stack(stack, i);
+
 			
 	}
 
@@ -4168,7 +4183,8 @@
 	if (bc->channel>0)
 		empty_chan_in_stack(stack, bc->channel);
 	empty_bc(bc);
-  
+ 	bc->in_use=0;
+
 	cb_event(EVENT_CLEANUP, bc, NULL); 
 }
 

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=70341&r1=70340&r2=70341
==============================================================================
--- branches/1.2/channels/misdn/isdn_lib.h (original)
+++ branches/1.2/channels/misdn/isdn_lib.h Wed Jun 20 10:29:09 2007
@@ -480,6 +480,7 @@
 char *bc_state2str(enum bchannel_state state);
 void bc_state_change(struct misdn_bchannel *bc, enum bchannel_state state);
 
+void misdn_dump_chanlist(void);
 
 
 #endif