From: Brian West <brian@freeswitch.org>
Date: Mon, 31 Dec 2007 20:33:08 +0000 (+0000)
Subject: generic code for various presence protocols we support
X-Git-Tag: v1.0-rc1~853
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42826a6a761771cd5c0f0512e191344bdf8325d5;p=thirdparty%2Ffreeswitch.git

generic code for various presence protocols we support

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7044 d0543943-73ff-0310-b7d9-9358b9ac24b2
---

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 9bde6d33f0..156b5f555e 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -742,21 +742,13 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
 					stream.write_function(&stream, "<remote>\n<identity display=\"%s\">sip:%s@%s</identity>\n", clean_from_user, clean_from_user, host);
 					stream.write_function(&stream, "<target uri=\"sip:**%s@%s\"/>\n", clean_to_user, host);
 					stream.write_function(&stream, "</remote>\n");
-				} else if (!strcasecmp(proto, "park")) {
-					stream.write_function(&stream, "<local>\n<identity display=\"parking\">sip:parking@%s;fifo=%s</identity>\n", 
-										  host, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown");
-					stream.write_function(&stream, "<target uri=\"sip:parking@%s\">\n", host);
+				} else if (!strcasecmp(proto, "park") | !strcasecmp(proto, "conf") | !strcasecmp(proto, "ext")) {
+					stream.write_function(&stream, "<local>\n<identity display=\"%s\">sip:%s@%s;%s=%s</identity>\n", 
+										  proto, proto, host, proto, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown");
+					stream.write_function(&stream, "<target uri=\"sip:%s@%s\">\n", proto, host);
 					stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"no\"/>\n</target>\n</local>\n");  
-					stream.write_function(&stream, "<remote>\n<identity display=\"parking\">sip:%s</identity>\n", uuid);
-					stream.write_function(&stream, "<target uri=\"sip:park+%s\"/>\n", uuid);
-					stream.write_function(&stream, "</remote>\n");
-				} else if (!strcasecmp(proto, "conf")) {
-					stream.write_function(&stream, "<local>\n<identity display=\"conference\">sip:conference@%s;conference=%s</identity>\n", 
-										  host, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown");
-					stream.write_function(&stream, "<target uri=\"sip:conference@%s\">\n", host);
-					stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"yes\"/>\n</target>\n</local>\n");  
-					stream.write_function(&stream, "<remote>\n<identity display=\"conference\">sip:%s@%s</identity>\n", uuid, host);
-					stream.write_function(&stream, "<target uri=\"sip:conf+%s@%s\"/>\n", uuid, host);
+					stream.write_function(&stream, "<remote>\n<identity display=\"%s\">sip:%s@%s</identity>\n", proto, uuid, host);
+					stream.write_function(&stream, "<target uri=\"sip:%s+%s@%s;%s=%s\"/>\n", proto, uuid, host, proto, uuid);
 					stream.write_function(&stream, "</remote>\n");
 				}
 			}