automerge commit

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

channels/chan_misdn.c

@@ -2913,6 +2913,11 @@ static struct ast_channel *misdn_request(const char *type, int format, void *dat
 	cl->bc=newbc;
 	
 	tmp = misdn_new(cl, AST_STATE_RESERVED, ext, NULL, format, port, channel);
+	if (!tmp) {
+		ast_log(LOG_ERROR,"Could not create Asterisk object\n");
+		return NULL;
+	}
+
 	cl->ast=tmp;
 	
 	/* register chan in local list */
@@ -3804,6 +3809,13 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
 		ch->orginator = ORG_MISDN;
 
 		chan=misdn_new(ch, AST_STATE_RESERVED,bc->dad, bc->oad, AST_FORMAT_ALAW, bc->port, bc->channel);
+
+		if (!chan) {
+			misdn_lib_send_event(bc,EVENT_RELEASE_COMPLETE);
+			ast_log(LOG_ERROR, "cb_events: misdn_new failed !\n"); 
+			return 0;
+		}
+
 		ch->ast = chan;
 
 		read_config(ch, ORG_MISDN);

channels/misdn/isdn_msg_parser.c

@@ -803,7 +803,7 @@ msg_t *build_restart (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
 	printf("Building RESTART Msg\n"); 
 #endif
 	enc_ie_channel_id(&restart->CHANNEL_ID, msg, 1,bc->channel, nt,bc);
-	enc_ie_restart_ind(&restart->RESTART_IND, msg, 0x80, nt, bc);
+	enc_ie_restart_ind(&restart->RESTART_IND, msg, 0, nt, bc);
 
 	cb_log(0,bc->port, "Restarting channel %d\n", bc->channel);