Module: kamailio
Branch: master
Commit: a9331b659eb767e8ae19f1ae2adb0ecbfbc71c13
URL: https://github.com/kamailio/kamailio/commit/a9331b659eb767e8ae19f1ae2adb0ec…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-17T08:45:06+01:00
presence_xml: include guard for pres_check.h, declare extern variables in .h
---
Modified: src/modules/presence_xml/add_events.h
Modified: src/modules/presence_xml/api.h
Modified: src/modules/presence_xml/pres_check.h
Modified: src/modules/presence_xml/presence_xml.c
---
Diff: https://github.com/kamailio/kamailio/commit/a9331b659eb767e8ae19f1ae2adb0ec…
Patch: https://github.com/kamailio/kamailio/commit/a9331b659eb767e8ae19f1ae2adb0ec…
---
diff --git a/src/modules/presence_xml/add_events.h b/src/modules/presence_xml/add_events.h
index a4acc8dd75..c15c75c368 100644
--- a/src/modules/presence_xml/add_events.h
+++ b/src/modules/presence_xml/add_events.h
@@ -13,15 +13,15 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
/*!
* \file
- * \brief Kamailio Presence_XML :: Several event packages, presence, presence.winfo, dialog;sla
+ * \brief Kamailio Presence_XML :: Several event packages, presence, presence.winfo, dialog;sla
* \ingroup presence_xml
*/
diff --git a/src/modules/presence_xml/api.h b/src/modules/presence_xml/api.h
index 73ed2c12d0..36a907f1cd 100644
--- a/src/modules/presence_xml/api.h
+++ b/src/modules/presence_xml/api.h
@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
+
#ifndef PXML_API_H
#define PXML_API_H
#include "../../core/str.h"
diff --git a/src/modules/presence_xml/pres_check.h b/src/modules/presence_xml/pres_check.h
index 70d1e88128..40b9409076 100644
--- a/src/modules/presence_xml/pres_check.h
+++ b/src/modules/presence_xml/pres_check.h
@@ -13,12 +13,16 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef _PRES_CHECK_H_
+#define _PRES_CHECK_H_
+
+
#include <stdio.h>
#include "../../core/parser/msg_parser.h"
#include "../presence/bind_presence.h"
@@ -26,6 +30,7 @@
int presxml_check_basic(struct sip_msg* msg, str presentity_uri, str status);
int presxml_check_activities(struct sip_msg* msg, str presentity_uri, str activity);
-contains_event_t pres_contains_event;
-pres_get_presentity_t pres_get_presentity;
-pres_free_presentity_t pres_free_presentity;
+extern contains_event_t pres_contains_event;
+extern pres_get_presentity_t pres_get_presentity;
+extern pres_free_presentity_t pres_free_presentity;
+#endif
diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c
index 228896c18a..3918903e96 100644
--- a/src/modules/presence_xml/presence_xml.c
+++ b/src/modules/presence_xml/presence_xml.c
@@ -78,6 +78,9 @@ add_event_t pres_add_event;
update_watchers_t pres_update_watchers;
pres_get_sphere_t pres_get_sphere;
+contains_event_t pres_contains_event;
+pres_get_presentity_t pres_get_presentity;
+pres_free_presentity_t pres_free_presentity;
/* Module parameter variables */
str xcap_table= str_init("xcap");
Hello,
being discussed at events offline or during irc meetings couple of
times, I want to open the discussion about updating the default
configuration file to use rtpengine. So far I let rtpproxy because was
packaged in many Linux distros, however, given the benefits of rtpengine
in terms of performance as well as webrtc support, doubled by the fact
that nowadays in the community it seems to be the primary choice of rtp
relay, we should decide what to do. I see two options:
1) add a define to allow selection between rtpproxy and rtpengine
2) replace rtpproxy completely with rtpengine
I would prefer 2) for simplicity of the configuration file, but the main
question for the users community is how easy they find the deploying of
rtpengine. Using Debian/Ubuntu should be trivial, there are packages for
it, but I do not know about CentOS, Fedora, openSUSE or other Linux/BSD
OSes people here are using it.
Reply to sr-users if you have an opinion on this matter (I cc-ed sr-dev
mainly to make aware the devs, but it is a matter of using kamailio). Of
course, other suggestions are welcome as well.
Cheers,
Daniel
--
Daniel-Constantin Mierla -- www.asipto.comwww.twitter.com/miconda -- www.linkedin.com/in/miconda
Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com
Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com
Hello,
Kamailio SIP Server v5.2.1 stable release is out.
This is a maintenance release of the latest stable branch, 5.2, that
includes fixes since the release of v5.2.0. There is no change to
database schema or configuration language structure that you have to do
on previous installations of v5.2.x. Deployments running previous v5.2.x
versions are strongly recommended to be upgraded to v5.2.1.
For more details about version 5.2.1 (including links and guidelines to
download the tarball or from GIT repository), visit:
* https://www.kamailio.org/w/2019/01/kamailio-v5-2-1-released/
RPM, Debian/Ubuntu packages will be available soon as well.
Many thanks to all contributing and using Kamailio!
Cheers,
Daniel
--
Daniel-Constantin Mierla -- www.asipto.comwww.twitter.com/miconda -- www.linkedin.com/in/miconda
Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com
Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com
Hello,
I am considering to release Kamailio v5.2.1 sometime next week, likely
on Tuesday (Jan 15) or Wednesday (Jan 16). Should any of you be aware of
issues not reported to the bug tracker, open a bug report as soon as
possible to give it a chance for analysis and an eventual fix:
- https://github.com/kamailio/kamailio/issues
Days after it, I am planning to make new releases from branch 5.1 and
5.0 (it should be the last one from there to mark the end of official
packaging).
Cheers,
Daniel
--
Daniel-Constantin Mierla -- www.asipto.comwww.twitter.com/miconda -- www.linkedin.com/in/miconda
Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com
Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com