Module: kamailio Branch: master Commit: a9331b659eb767e8ae19f1ae2adb0ecbfbc71c13 URL: https://github.com/kamailio/kamailio/commit/a9331b659eb767e8ae19f1ae2adb0ecb...

Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@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/a9331b659eb767e8ae19f1ae2adb0ecb... Patch: https://github.com/kamailio/kamailio/commit/a9331b659eb767e8ae19f1ae2adb0ecb...

---

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");