flexisip-presence.patch

flexisip-presence.patch

diff -urN flexisip-1.0.4-orig/src/main.cc flexisip-1.0.4/src/main.cc
--- flexisip-1.0.4-orig/src/main.cc	2015-07-25 16:02:22.091635154 -0400
+++ flexisip-1.0.4/src/main.cc	2015-07-25 16:03:06.923160716 -0400
@@ -710,7 +710,7 @@
 	}
 
 #ifdef ENABLE_PRESENCE
-	flexisip::PresenceServer presenceServer(cfgfile);
+	flexisip::PresenceServer presenceServer(configFile.getValue());
 	presenceServer.start();
 #endif //ENABLE_PRESENCE
 
diff -urN flexisip-1.0.4-orig/src/presence/Makefile.am flexisip-1.0.4/src/presence/Makefile.am
--- flexisip-1.0.4-orig/src/presence/Makefile.am	2015-07-25 15:23:05.090192599 -0400
+++ flexisip-1.0.4/src/presence/Makefile.am	2015-07-25 15:23:54.944558816 -0400
@@ -10,9 +10,9 @@
 					signaling-exception.cc signaling-exception.hh\
 					subscription.cc subscription.hh etag-manager.hh presentity-manager.hh
 							
-libflexisip_presence_la_LIBADD= libxml_binding_generated.la $(ORTP_LIBS) $(BELLESIP_LIBS) $(XERCESC_LIBS)
+libflexisip_presence_la_LIBADD= ../xml/libxml_binding_generated.la $(ORTP_LIBS) $(BELLESIP_LIBS) $(XERCESC_LIBS)
 							 
-AM_CPPFLAGS= -I $(abs_srcdir)/../ -I$(builddir)/xml $(SOFIA_CFLAGS) -DBELLE_SIP_USE_STL=1 $(BELLESIP_CFLAGS) $(ORTP_CFLAGS) $(XSDCXX_CPPFLAGS) $(XERCESC_CFLAGS)  
+AM_CPPFLAGS= -I $(abs_srcdir)/../ -I$(top_builddir)/src/xml $(SOFIA_CFLAGS) -DBELLE_SIP_USE_STL=1 $(BELLESIP_CFLAGS) $(ORTP_CFLAGS) $(XSDCXX_CPPFLAGS) $(XERCESC_CFLAGS)  
 AM_LDFLAGS= 
 
 endif
diff -urN flexisip-1.0.4-orig/src/module-presence.cc flexisip-1.0.4/src/module-presence.cc
--- flexisip-1.0.4-orig/src/module-presence.cc	2015-07-25 18:29:37.236468095 -0400
+++ flexisip-1.0.4/src/module-presence.cc	2015-07-25 18:31:18.392691044 -0400
@@ -68,7 +68,7 @@
 
 	void route(shared_ptr<RequestSipEvent> &ev) {
 		SLOGI << *this << " routing to [" << mDestRoute << "]";
-		cleanAndPrependRoute(&mHome,this->getAgent(),ev->getMsgSip()->getMsg(),ev->getSip(),mDestRoute.c_str());
+		cleanAndPrependRoute(this->getAgent(),ev->getMsgSip()->getMsg(),ev->getSip(),sip_route_make(&mHome,mDestRoute.c_str()));
 
 	}
 	bool isMessageAPresenceMessage(shared_ptr<RequestSipEvent> &ev) {
@@ -100,6 +100,5 @@
 };
 ModuleInfo<ModulePresence> ModulePresence::sInfo("Presence",
 		"This module transfert sip presence messages, like subscribe/notify/publish to a presence server. ",
-		ModuleInfoBase::ModuleOid::Presence,
-		ModuleInfoBase::ModuleTypeExperimental);
+		ModuleInfoBase::ModuleOid::Presence);