提交 f5ade7cf authored 作者: Brian West's avatar Brian West

remove dirty hack to get around a bug in sofia which has now been fixed. And fix…

remove dirty hack to get around a bug in sofia which has now been fixed. And fix registering to pointers isn't allowed

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12324 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 a58bdeac
...@@ -2500,11 +2500,6 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status ...@@ -2500,11 +2500,6 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
} }
} }
/* dirty hack to avoid race condition in the library */
if (status == 200 || status == 183) {
switch_yield(100);// printf("Avoiding Segfault!!!\n");
}
if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) {
if (!sofia_test_flag(tech_pvt, TFLAG_SENT_UPDATE)) { if (!sofia_test_flag(tech_pvt, TFLAG_SENT_UPDATE)) {
......
...@@ -1552,6 +1552,13 @@ auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t co ...@@ -1552,6 +1552,13 @@ auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t co
ret = AUTH_FORBIDDEN; ret = AUTH_FORBIDDEN;
goto end; goto end;
} else {
const char *type = switch_xml_attr(user, "type");
if (type && !strcasecmp(type, "pointer")) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cant register a pointer.\n");
ret = AUTH_FORBIDDEN;
goto end;
}
} }
if (!(mailbox = (char *) switch_xml_attr(user, "mailbox"))) { if (!(mailbox = (char *) switch_xml_attr(user, "mailbox"))) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论