提交 2fe0c8c0 authored 作者: Brian West's avatar Brian West 提交者: Mike Jerris

FS-9204: complte the urls so that snom can execute the pickup, It used to…

FS-9204: complte the urls so that snom can execute the pickup, It used to probably send it to the proxy, but now needs the host in the packet or throws network error
上级 7bcaaeb5
...@@ -3017,11 +3017,11 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char * ...@@ -3017,11 +3017,11 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
!zstr(clean_to_user) ? clean_to_user : "unknown", host); !zstr(clean_to_user) ? clean_to_user : "unknown", host);
stream.write_function(&stream, "<target uri=\"sip:%s@%s;proto=fifo\">\n", !zstr(clean_to_user) ? clean_to_user : "unknown", host); stream.write_function(&stream, "<target uri=\"sip:%s@%s;proto=fifo\">\n", !zstr(clean_to_user) ? clean_to_user : "unknown", host);
stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"no\"/>\n</target>\n</local>\n"); stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"no\"/>\n</target>\n</local>\n");
stream.write_function(&stream, "<remote>\n<identity display=\"queue\">sip:%s</identity>\n", uuid); stream.write_function(&stream, "<remote>\n<identity display=\"queue\">sip:%s@%s</identity>\n", uuid, host);
if (skip_proto) { if (skip_proto) {
stream.write_function(&stream, "<target uri=\"sip:%s\"/>\n", uuid); stream.write_function(&stream, "<target uri=\"sip:%s@%s\"/>\n", uuid, host);
} else { } else {
stream.write_function(&stream, "<target uri=\"sip:queue+%s\"/>\n", uuid); stream.write_function(&stream, "<target uri=\"sip:queue+%s@%s\"/>\n", uuid, host);
} }
stream.write_function(&stream, "</remote>\n"); stream.write_function(&stream, "</remote>\n");
...@@ -3032,9 +3032,9 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char * ...@@ -3032,9 +3032,9 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"no\"/>\n</target>\n</local>\n"); stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"no\"/>\n</target>\n</local>\n");
stream.write_function(&stream, "<remote>\n<identity display=\"park\">sip:%s</identity>\n", uuid); stream.write_function(&stream, "<remote>\n<identity display=\"park\">sip:%s</identity>\n", uuid);
if (skip_proto) { if (skip_proto) {
stream.write_function(&stream, "<target uri=\"sip:%s\"/>\n", uuid); stream.write_function(&stream, "<target uri=\"sip:%s@%s\"/>\n", uuid, host);
} else { } else {
stream.write_function(&stream, "<target uri=\"sip:park+%s\"/>\n", uuid); stream.write_function(&stream, "<target uri=\"sip:park+%s@%s\"/>\n", uuid, host);
} }
stream.write_function(&stream, "</remote>\n"); stream.write_function(&stream, "</remote>\n");
} else if (!strcasecmp(proto, "pickup")) { } else if (!strcasecmp(proto, "pickup")) {
...@@ -3042,11 +3042,11 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char * ...@@ -3042,11 +3042,11 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
!zstr(clean_to_user) ? clean_to_user : "unknown", host); !zstr(clean_to_user) ? clean_to_user : "unknown", host);
stream.write_function(&stream, "<target uri=\"sip:%s@%s;proto=pickup\">\n", !zstr(clean_to_user) ? clean_to_user : "unknown", host); stream.write_function(&stream, "<target uri=\"sip:%s@%s;proto=pickup\">\n", !zstr(clean_to_user) ? clean_to_user : "unknown", host);
stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"no\"/>\n</target>\n</local>\n"); stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"no\"/>\n</target>\n</local>\n");
stream.write_function(&stream, "<remote>\n<identity display=\"pickup\">sip:%s</identity>\n", uuid); stream.write_function(&stream, "<remote>\n<identity display=\"pickup\">sip:%s@%s</identity>\n", uuid, host);
if (skip_proto) { if (skip_proto) {
stream.write_function(&stream, "<target uri=\"sip:%s\"/>\n", uuid); stream.write_function(&stream, "<target uri=\"sip:%s@%s\"/>\n", uuid, host);
} else { } else {
stream.write_function(&stream, "<target uri=\"sip:pickup+%s\"/>\n", uuid); stream.write_function(&stream, "<target uri=\"sip:pickup+%s@%s\"/>\n", uuid, host);
} }
stream.write_function(&stream, "</remote>\n"); stream.write_function(&stream, "</remote>\n");
} else if (!strcasecmp(proto, "conf")) { } else if (!strcasecmp(proto, "conf")) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论