kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 07:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@62910 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge Script
2007-05-03 14:11:27 +00:00
parent c45d0c0b54
commit cf88fd1109
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_misdn.c
View File

@@ -2308,7 +2308,7 @@ static int misdn_write(struct ast_channel *ast, struct ast_frame *frame)
if ( !frame->samples ) { if ( !frame->samples ) {
chan_misdn_log(4, ch->bc->port, "misdn_write: zero write\n"); chan_misdn_log(4, ch->bc->port, "misdn_write: zero write\n");
return 0; return -1;
} }
if ( ! ch->bc->addr ) { if ( ! ch->bc->addr ) {

4
channels/misdn/isdn_msg_parser.c
View File

@@ -285,6 +285,10 @@ msg_t *build_setup (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
enc_ie_redir_nr(&setup->REDIR_NR, msg, 1, 1, bc->pres, bc->screen, 0, bc->rad, nt,bc); enc_ie_redir_nr(&setup->REDIR_NR, msg, 1, 1, bc->pres, bc->screen, 0, bc->rad, nt,bc);
} }
{
if (bc->keypad[0])
enc_ie_keypad(&setup->CALLED_PN, msg, bc->keypad, nt,bc);
}
if (*bc->display) { if (*bc->display) {