diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-14 19:20:29 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-14 19:20:29 +0000 |
| commit | 41fec0ae76a5ea8cbe8efe6b45028e1580f0ef42 (patch) | |
| tree | 3ccd1af1622a0cebc9a8f684abefed631a91cef2 /channels | |
| parent | 218db93ba9b7e54f2f0bc12b738e6d7963b6d8c6 (diff) | |
Fix merge error caused by merging -r132883 and -r121770 from
https://origsvn.digium.com/svn/asterisk/trunk out of order.
(closes issue #13788)
Reported by: IgorG
(closes issue #13491)
Reported by: avalentin
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@168607 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/misdn/isdn_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index 3f634183d..1158b6ef3 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -3134,7 +3134,7 @@ static int test_inuse(struct misdn_bchannel *bc) struct timeval now; gettimeofday(&now, NULL); if (!bc->in_use) { - if ( bc->last_used.tv_sec == now.tv_sec ) { + if (misdn_lib_port_is_pri(bc->port) && bc->last_used.tv_sec == now.tv_sec ) { cb_log(2,bc->port, "channel with stid:%x for one second still in use! (n:%d lu:%d)\n", bc->b_stid, (int) now.tv_sec, (int) bc->last_used.tv_sec); return 1; } |