Minor formatting fixes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5271 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Mark Spencer 20 years ago
parent cd0655bf89
commit fdc402153d

@ -2204,17 +2204,14 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, char *title)
tmp->nativeformats = ast_codec_choose(&i->prefs, global_capability, 1); tmp->nativeformats = ast_codec_choose(&i->prefs, global_capability, 1);
ast_mutex_unlock(&i->lock); ast_mutex_unlock(&i->lock);
fmt = ast_best_codec(tmp->nativeformats); fmt = ast_best_codec(tmp->nativeformats);
if (title) if (title)
snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%04x", title, rand() & 0xffff); snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%04x", title, rand() & 0xffff);
else else if (strchr(i->fromdomain,':'))
if (strchr(i->fromdomain,':'))
{
snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%08x", strchr(i->fromdomain,':')+1, (int)(long)(i)); snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%08x", strchr(i->fromdomain,':')+1, (int)(long)(i));
}
else else
{
snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%08x", i->fromdomain, (int)(long)(i)); snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%08x", i->fromdomain, (int)(long)(i));
}
tmp->type = channeltype; tmp->type = channeltype;
if (ast_test_flag(i, SIP_DTMF) == SIP_DTMF_INBAND) { if (ast_test_flag(i, SIP_DTMF) == SIP_DTMF_INBAND) {
i->vad = ast_dsp_new(); i->vad = ast_dsp_new();

Loading…
Cancel
Save