added bearer capability reject support. we send release instead of disconnect in case we have no real channel yet. added support for Restarting channels added support for sending complete decoding. changed some log levels.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31324 65c4cc65-6c06-0410-ace0-fbb531ad65f3

5 files changed, 53 insertions, 26 deletions

diff --git a/channels/misdn/chan_misdn_config.h b/channels/misdn/chan_misdn_config.h
index b119ffc65..0be6d6a2e 100644
--- a/channels/misdn/chan_misdn_config.h
+++ b/channels/misdn/chan_misdn_config.h
@@ -23,6 +23,7 @@ enum misdn_cfg_elements {
 	/* port config items */
 	MISDN_CFG_FIRST = 0,
 	MISDN_CFG_GROUPNAME,           /* char[] */
+	MISDN_CFG_ALLOWED_BEARERS,           /* char[] */
 	MISDN_CFG_FAR_ALERTING,        /* int (bool) */
 	MISDN_CFG_RXGAIN,              /* int */
 	MISDN_CFG_TXGAIN,              /* int */
diff --git a/channels/misdn/ie.c b/channels/misdn/ie.c
index 6f29cb2f8..eeeff040b 100644
--- a/channels/misdn/ie.c
+++ b/channels/misdn/ie.c
@@ -162,23 +162,28 @@ void dec_ie_bearer(unsigned char *p, Q931_info_t *qi, int *coding, int *capabili
 	*stopbits = -1;
 	*dbits = -1;
 	*parity = -1;
-
+	
 	if (!nt)
 	{
 		p = NULL;
-		if (qi->QI_ELEMENT(llc))
+#ifdef LLC_SUPPORT
+		if (qi->QI_ELEMENT(llc)) {
+			
 			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->QI_ELEMENT(llc) + 1;
-		else if (qi->QI_ELEMENT(bearer_capability))
+		}
+#endif
+		if (qi->QI_ELEMENT(bearer_capability))
 			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->QI_ELEMENT(bearer_capability) + 1;
 	}
 	if (!p)
 		return;
+
 	if (p[0] < 2)
 	{
 		printf("%s: ERROR: IE too short (%d).\n", __FUNCTION__, p[0]);
 		return;
 	}
-
+	
 	*coding = (p[1]&0x60) >> 5;
 	*capability = p[1] & 0x1f;
 	octet = 2;
diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index a969d11d9..ad3c43ba4 100644
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -471,6 +471,10 @@ void empty_bc(struct misdn_bchannel *bc)
 	bc->channel = 0;
 	bc->in_use = 0;
 
+	bc->sending_complete = 0;
+
+	bc->restart_channel=0;
+	
 	bc->conf_id = 0;
 
 	bc->need_more_infos = 0;
@@ -557,7 +561,7 @@ int clean_up_bc(struct misdn_bchannel *bc)
 	unsigned char buff[32];
 	struct misdn_stack * stack;
 
-	cb_log(2, 0, "$$$ CLEANUP CALLED\n");
+	cb_log(3, 0, "$$$ CLEANUP CALLED\n");
 	
 	if (!bc  ) return -1;
 	stack=get_stack_by_bc(bc);
@@ -587,15 +591,18 @@ int clean_up_bc(struct misdn_bchannel *bc)
 		manager_ec_disable(bc);
 	}
 
-	mISDN_write_frame(stack->midev, buff, bc->layer_id|FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); 
+	if (bc->bc_state == BCHAN_SETUP) 
+		mISDN_write_frame(stack->midev, buff, bc->layer_id|FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
+	else
+		mISDN_write_frame(stack->midev, buff, bc->addr|FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
 
-	cb_log(2, stack->port, "$$$ CLEARING STACK\n");
+	cb_log(3, stack->port, "$$$ CLEARING STACK\n");
+	
 	ret=mISDN_clear_stack(stack->midev,bc->b_stid);
 	if (ret<0) {
 		cb_log(-1,stack->port,"clear stack failed [%s]\n",strerror(errno));
 	}
 
-	
 	bc->b_stid = 0;
 	bc_state_change(bc, BCHAN_CLEANED);
 	
@@ -612,8 +619,7 @@ void clear_l3(struct misdn_stack *stack)
 			cb_event(EVENT_CLEANUP, &stack->bc[i], glob_mgr->user_data);
 			empty_chan_in_stack(stack,i+1);
 			empty_bc(&stack->bc[i]);
-			queue_cleanup_bc(&stack->bc[i]);
-			
+			clean_up_bc(&stack->bc[i]);
 		}
 		
 	} 
@@ -971,19 +977,18 @@ int setup_bc(struct misdn_bchannel *bc)
 		pid.layermask = ISDN_LAYER((1)) | ISDN_LAYER((2)) | ISDN_LAYER((3)) | ISDN_LAYER((4));
 		
 	} 
-	
+
 	ret = mISDN_set_stack(midev, bc->b_stid, &pid);
-	
+
 	if (ret){
-		cb_log(5, stack->port,"$$$ Set Stack Err: %d %s\n",ret,strerror(errno));
+		cb_log(-1, stack->port,"$$$ Set Stack Err: %d %s\n",ret,strerror(errno));
 		
 		mISDN_write_frame(midev, buff, bc->layer_id, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
-
+		
 		bc_state_change(bc,BCHAN_ERROR);
 		return(-EINVAL);
 	}
 
-
 	bc_state_change(bc,BCHAN_SETUP);
 
 	
@@ -1479,7 +1484,7 @@ int handle_cr ( struct misdn_stack *stack, iframe_t *frm)
 				cb_log(4, stack->port, " --> lib: CLEANING UP l3id: %x\n",frm->dinfo);
 				empty_chan_in_stack(stack,bc->channel);
 				empty_bc(bc);
-				queue_cleanup_bc(bc);
+				clean_up_bc(bc);
 				dump_chan_list(stack);
 				bc->pid = 0;
 				cb_event(EVENT_CLEANUP, bc, glob_mgr->user_data);
@@ -1517,7 +1522,7 @@ void misdn_lib_release(struct misdn_bchannel *bc)
 		empty_chan_in_stack(stack,bc->channel);
 		empty_bc(bc);
 	}
-	queue_cleanup_bc(bc);
+	clean_up_bc(bc);
 }
 
 
@@ -2049,7 +2054,7 @@ int handle_bchan(msg_t *msg)
 		
 	case MGR_SETSTACK| INDICATION:
 		cb_log(2, stack->port, "BCHAN: MGR_SETSTACK|IND \n");
-
+		
 	AGAIN:
 		bc->addr = mISDN_get_layerid(stack->midev, bc->b_stid, bc->layer);
 		if (!bc->addr) {
@@ -2943,7 +2948,7 @@ int misdn_lib_send_event(struct misdn_bchannel *bc, enum event_e event )
 
 			empty_chan_in_stack(stack,bc->channel);
 			empty_bc(bc);
-			queue_cleanup_bc(bc);
+			clean_up_bc(bc);
 		}
 		
 		/** we set it up later at RETRIEVE_ACK again.**/
@@ -3018,6 +3023,13 @@ int handle_err(msg_t *msg)
 		case MGR_SETSTACK|INDICATION:
 			return handle_bchan(msg);
 		break;
+
+		case MGR_SETSTACK|CONFIRM:
+		case MGR_CLEARSTACK|CONFIRM:
+			free_msg(msg) ; 
+			return 1;
+		break;
+
 		case DL_DATA|INDICATION:
 		{
 			int port=(frm->addr&MASTER_ID_MASK) >> 8;
@@ -3101,8 +3113,10 @@ int manager_isdn_handler(iframe_t *frm ,msg_t *msg)
 	if (handle_l1(msg)) 
 		return 0 ;
 
-	/* The L2/L3 will be queued */
-	if (queue_l2l3(msg))
+	if (handle_frm_nt(msg)) 
+		return 0;
+
+	if (handle_frm(msg))
 		return 0;
 
 	if (handle_err(msg)) 
@@ -3862,7 +3876,7 @@ void misdn_split_conf(struct misdn_bchannel *bc, int conf_id)
 }
 
 void misdn_lib_bridge( struct misdn_bchannel * bc1, struct misdn_bchannel *bc2) {
-	int conf_id=(bc1->pid<<1) +1;
+	int conf_id=bc1->pid +1;
 
 	cb_log(1, bc1->port, "I Send: BRIDGE from:%d to:%d\n",bc1->port,bc2->port);
 	
diff --git a/channels/misdn/isdn_lib.h b/channels/misdn/isdn_lib.h
index 98c40b03a..a127c8f4e 100644
--- a/channels/misdn/isdn_lib.h
+++ b/channels/misdn/isdn_lib.h
@@ -182,7 +182,8 @@ struct misdn_bchannel {
 	int l3_id;
 	int pid;
 	int ces;
-  
+
+	int restart_channel;
 	int channel;
 	int channel_preselected;
 	
@@ -208,6 +209,10 @@ struct misdn_bchannel {
 	/* get setup ack */
 	int need_more_infos;
 
+	/* may there be more infos ?*/
+	int sending_complete;
+
+
 	/* wether we should use jollys dsp or not */
 	int nodsp;
 	
diff --git a/channels/misdn/isdn_msg_parser.c b/channels/misdn/isdn_msg_parser.c
index 0d5fb9f72..a11ffefe6 100644
--- a/channels/misdn/isdn_msg_parser.c
+++ b/channels/misdn/isdn_msg_parser.c
@@ -197,8 +197,8 @@ void parse_setup (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc,
 	}
 
 	{
-		int  sending_complete;
-		dec_ie_complete(setup->COMPLETE, (Q931_info_t *)setup, &sending_complete, nt,bc);
+		dec_ie_complete(setup->COMPLETE, (Q931_info_t *)setup, &bc->sending_complete, nt,bc);
+		
 	}
   
 	{
@@ -217,6 +217,8 @@ void parse_setup (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc,
 			break;
 		case 0: bc->capability=INFO_CAPABILITY_SPEECH;
 			break;
+		case 18: bc->capability=INFO_CAPABILITY_VIDEO;
+			break;
 		case 8: bc->capability=INFO_CAPABILITY_DIGITAL_UNRESTRICTED;
 			bc->user1 = user;
 			bc->urate = urate;
@@ -775,7 +777,7 @@ void parse_restart (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *b
   
 	{
 		int  exclusive, channel;
-		dec_ie_channel_id(restart->CHANNEL_ID, (Q931_info_t *)restart, &exclusive, &channel, nt,bc);
+		dec_ie_channel_id(restart->CHANNEL_ID, (Q931_info_t *)restart, &exclusive, &bc->restart_channel, nt,bc);
 		if (channel==0xff) /* any channel */
 			channel=-1;
 		cb_log(3, stack->port, "CC_RESTART Request on channel:%d on this port.\n");