FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi: Add error messages in dahdi_ioctl_chanconfig.

Browse Source 
Provide more context to trouble shoot failures.

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Acked-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10271 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Tzafrir Cohen 2011-10-26 18:57:07 +00:00
parent 33c31e9593
commit 3998c8fd11
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/dahdi/dahdi-base.c
View File

@ -4466,19 +4466,28 @@ static int dahdi_ioctl_chanconfig(struct file *file, unsigned long data)
return -EFAULT; return -EFAULT;
chan = chan_from_num(ch.chan); chan = chan_from_num(ch.chan);
if (!chan) if (!chan) {
printk(KERN_NOTICE "%s: No channel for number %d\n",
__func__, ch.chan);
return -EINVAL; return -EINVAL;
}
if (ch.sigtype == DAHDI_SIG_SLAVE) { if (ch.sigtype == DAHDI_SIG_SLAVE) {
newmaster = chan_from_num(ch.master); newmaster = chan_from_num(ch.master);
if (!newmaster) if (!newmaster) {
chan_notice(chan, "%s: slave channel without master.\n",
__func__);
return -EINVAL; return -EINVAL;
}
ch.sigtype = newmaster->sig; ch.sigtype = newmaster->sig;
} else if ((ch.sigtype & __DAHDI_SIG_DACS) == __DAHDI_SIG_DACS) { } else if ((ch.sigtype & __DAHDI_SIG_DACS) == __DAHDI_SIG_DACS) {
newmaster = chan; newmaster = chan;
dacs_chan = chan_from_num(ch.idlebits); dacs_chan = chan_from_num(ch.idlebits);
if (!dacs_chan) if (!dacs_chan) {
chan_notice(chan, "%s: dacs channel not found: %d.\n",
__func__, ch.idlebits);
return -EINVAL; return -EINVAL;
}
} else { } else {
newmaster = chan; newmaster = chan;
} }
@ -4511,8 +4520,13 @@ static int dahdi_ioctl_chanconfig(struct file *file, unsigned long data)
if (sigcap & DAHDI_SIG_CLEAR) if (sigcap & DAHDI_SIG_CLEAR)
sigcap |= (DAHDI_SIG_HDLCRAW | DAHDI_SIG_HDLCFCS | DAHDI_SIG_HDLCNET | DAHDI_SIG_DACS); sigcap |= (DAHDI_SIG_HDLCRAW | DAHDI_SIG_HDLCFCS | DAHDI_SIG_HDLCNET | DAHDI_SIG_DACS);
if ((sigcap & ch.sigtype) != ch.sigtype) if ((sigcap & ch.sigtype) != ch.sigtype) {
if (debug) {
chan_notice(chan, "%s: bad sigtype. sigcap: %x, sigtype: %x.\n",
__func__, sigcap, ch.sigtype);
}
res = -EINVAL; res = -EINVAL;
}
if (chan->master != chan) { if (chan->master != chan) {
struct dahdi_chan *oldmaster = chan->master; struct dahdi_chan *oldmaster = chan->master;
@ -4556,6 +4570,8 @@ static int dahdi_ioctl_chanconfig(struct file *file, unsigned long data)
if ((ch.sigtype & __DAHDI_SIG_DACS) == __DAHDI_SIG_DACS) { if ((ch.sigtype & __DAHDI_SIG_DACS) == __DAHDI_SIG_DACS) {
if (unlikely(!dacs_chan)) { if (unlikely(!dacs_chan)) {
spin_unlock_irqrestore(&chan->lock, flags); spin_unlock_irqrestore(&chan->lock, flags);
chan_notice(chan, "%s: dacs but no dacs_chan\n",
__func__);
return -EINVAL; return -EINVAL;
} }
/* Setup conference properly */ /* Setup conference properly */