diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-07 16:02:13 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-07 16:02:13 +0000 |
| commit | 974652e0e725baad2db2bf9e5c0d00d195f38440 (patch) | |
| tree | 4bc8239e616b4e9961f2fcab1ad96d4e3b77f776 /channels | |
| parent | 845a6599de6708212b2bab9db6d37347a498c884 (diff) | |
Cleanups to the ordering of events in dial, don't freak out on the wrong codec
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3385 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_sip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 2cd5b6f5e..b3dff70c1 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1799,7 +1799,7 @@ static int sip_write(struct ast_channel *ast, struct ast_frame *frame) if (!(frame->subclass & ast->nativeformats)) { ast_log(LOG_WARNING, "Asked to transmit frame type %d, while native formats is %d (read/write = %d/%d)\n", frame->subclass, ast->nativeformats, ast->readformat, ast->writeformat); - return -1; + return 0; } if (p) { ast_mutex_lock(&p->lock); @@ -7864,7 +7864,7 @@ static struct sip_peer *build_peer(char *name, struct ast_variable *v) peer->promiscredir = ast_true(v->value); else if (!strcasecmp(v->name, "fromuser")) strncpy(peer->fromuser, v->value, sizeof(peer->fromuser)-1); - else if (!strcasecmp(v->name, "dtmfmode")) { + else if (!strcasecmp(v->name, "dtmfmode")) { if (!strcasecmp(v->value, "inband")) peer->dtmfmode=SIP_DTMF_INBAND; else if (!strcasecmp(v->value, "rfc2833")) |