diff options
| author | matteo <matteo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-02-14 06:00:11 +0000 |
|---|---|---|
| committer | matteo <matteo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-02-14 06:00:11 +0000 |
| commit | 7dc232beda6ba9c8ad5231c10a8e3c13cb735cd8 (patch) | |
| tree | 4d5b29650be4cacf2c29710581941f0e84cfd431 /channels/chan_iax.c | |
| parent | 54b168a25414b0994fa47dc2d79408ce9586000a (diff) | |
Fri Feb 14 07:00:01 CET 2003
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@614 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax.c')
| -rwxr-xr-x | channels/chan_iax.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/channels/chan_iax.c b/channels/chan_iax.c index ce896c738..d48b24f55 100755 --- a/channels/chan_iax.c +++ b/channels/chan_iax.c @@ -1758,6 +1758,10 @@ static int iax_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, ast_verbose(VERBOSE_PREFIX_3 "Can't masquerade, we're different...\n"); return -2; } + if (c0->nativeformats != c1->nativeformats) { + ast_verbose(VERBOSE_PREFIX_3 "Operating with different codecs, can't native bridge...\n"); + return -2; + } if (!transferstarted) { /* Try the transfer */ if (iax_start_transfer(c0, c1)) @@ -2240,12 +2244,13 @@ static int iax_show_channels(int fd, int argc, char *argv[]) #define FORMAT2 "%-15.15s %-10.10s %-11.11s %-11.11s %-7.7s %-6.6s %s\n" #define FORMAT "%-15.15s %-10.10s %5.5d/%5.5d %5.5d/%5.5d %-5.5dms %-4.4dms %d\n" int x; + int numchans = 0; if (argc != 3) return RESULT_SHOWUSAGE; ast_cli(fd, FORMAT2, "Peer", "Username", "ID (Lo/Rem)", "Seq (Tx/Rx)", "Lag", "Jitter", "Format"); for (x=0;x<AST_IAX_MAX_CALLS;x++) { ast_pthread_mutex_lock(&iaxsl[x]); - if (iaxs[x]) + if (iaxs[x]) { ast_cli(fd, FORMAT, inet_ntoa(iaxs[x]->addr.sin_addr), strlen(iaxs[x]->username) ? iaxs[x]->username : "(None)", iaxs[x]->callno, iaxs[x]->peercallno, @@ -2253,8 +2258,11 @@ static int iax_show_channels(int fd, int argc, char *argv[]) iaxs[x]->lag, iaxs[x]->jitter, iaxs[x]->voiceformat); + numchans++; + } ast_pthread_mutex_unlock(&iaxsl[x]); } + ast_cli(fd, "%d active IAX channel(s)\n", numchans); return RESULT_SUCCESS; #undef FORMAT #undef FORMAT2 |